teams-cli 0.2.5__tar.gz → 0.2.6__tar.gz

{teams_cli-0.2.5 → teams_cli-0.2.6}/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.6](https://github.com/rvben/teams-cli/compare/v0.2.5...v0.2.6) - 2026-10-27
+
+### Fixed
+
+- `teams people search` finds work and school colleagues again with the desktop backend. It now uses the same directory search as the Teams people picker; the lookup it used before returned nothing, or failed with "Teams could not resolve this person" in a headless browser.
+- **desktop**: accept signed macOS system UIDs ([b7a1521](https://github.com/rvben/teams-cli/commit/b7a152189d2bc636cebe5ca67f24172dd702ae75))
+- **desktop**: validate helper archives with tar-codec ([b955dd8](https://github.com/rvben/teams-cli/commit/b955dd8ea93cb302d72107cd2701e2adc8380ab3))
+
 ## [0.2.5](https://github.com/rvben/teams-cli/compare/v0.2.4...v0.2.5) - 2026-10-21
 
 ### Fixed

{teams_cli-0.2.5 → teams_cli-0.2.6}/Cargo.lock

@@ -37,6 +37,12 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
+[[package]]
+name = "ambient-authority"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9d4ee0d472d1cd2e28c97dfa124b3d8d992e10eb0a035f33f5d12e3a177ba3b"
+
 [[package]]
 name = "anstream"
 version = "1.0.0"
@@ -102,6 +108,19 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "archive-trait"
+version = "0.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "999bf88cc483664cab77700ca2fdfb0415a73412abe284ef5bc2319d00938e00"
+dependencies = [
+ "cap-std",
+ "thiserror 2.0.20",
+ "tokio",
+ "walkdir",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "assert-json-diff"
 version = "2.0.2"
@@ -127,6 +146,18 @@ dependencies = [
  "wait-timeout",
 ]
 
+[[package]]
+name = "async-compression"
+version = "0.4.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d5755640120b24961f8231e05892e4a4f7e0d04e8aeca161508c9c397946970"
+dependencies = [
+ "compression-codecs",
+ "compression-core",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "atomic"
 version = "0.6.1"
@@ -296,6 +327,36 @@ version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
 
+[[package]]
+name = "cap-primitives"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b5f74729fd2f44701d1a8eb47e906cdb3ccd9ec0f02baad85a744b791940b18"
+dependencies = [
+ "ambient-authority",
+ "fs-set-times",
+ "io-extras",
+ "io-lifetimes 3.0.1",
+ "ipnet",
+ "maybe-owned",
+ "rustix",
+ "rustix-linux-procfs",
+ "windows-sys 0.61.2",
+ "winx",
+]
+
+[[package]]
+name = "cap-std"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1ec78e242cfa2cfe276807ac2ecc00315a6c97786977414bcd1c3963b6c91b8"
+dependencies = [
+ "cap-primitives",
+ "io-extras",
+ "io-lifetimes 3.0.1",
+ "rustix",
+]
+
 [[package]]
 name = "castaway"
 version = "0.2.4"
@@ -428,6 +489,23 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "compression-codecs"
+version = "0.4.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cae36683101b2899f48bd31f8db9839437356188e3b1ff23096e73dab09ba8fe"
+dependencies = [
+ "compression-core",
+ "flate2",
+ "memchr",
+]
+
+[[package]]
+name = "compression-core"
+version = "0.4.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ebdda89edc534bf8d5dd2857562633b6495557e5846552ade994b99ed13c36a"
+
 [[package]]
 name = "const-oid"
 version = "0.10.2"
@@ -959,6 +1037,17 @@ dependencies = [
  "num",
 ]
 
+[[package]]
+name = "fs-set-times"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a"
+dependencies = [
+ "io-lifetimes 2.0.4",
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "fs_extra"
 version = "1.3.0"
@@ -1419,6 +1508,28 @@ dependencies = [
  "syn 3.0.4",
 ]
 
+[[package]]
+name = "io-extras"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20fd6de4ccfcc187e38bc21cfa543cb5a302cb86a8b114eb7f0bf0dc9f8ac00f"
+dependencies = [
+ "io-lifetimes 3.0.1",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06432fb54d3be7964ecd3649233cddf80db2832f47fec34c01f65b3d9d774983"
+
+[[package]]
+name = "io-lifetimes"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0fb0570afe1fed943c5c3d4102d5358592d8625fda6a0007fdbe65a92fba96"
+
 [[package]]
 name = "ipnet"
 version = "2.12.1"
@@ -1780,6 +1891,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "maybe-owned"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4"
+
 [[package]]
 name = "memchr"
 version = "2.8.3"
@@ -2750,6 +2867,16 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "rustix-linux-procfs"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fc84bf7e9aa16c4f2c758f27412dc9841341e16aa682d9c7ac308fe3ee12056"
+dependencies = [
+ "once_cell",
+ "rustix",
+]
+
 [[package]]
 name = "rustls"
 version = "0.23.46"
@@ -3185,11 +3312,34 @@ dependencies = [
  "xattr",
 ]
 
+[[package]]
+name = "tar-codec"
+version = "0.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9dad615e50d181afea4bafea23dacb8e33ed52dde06503813570634b932d467"
+dependencies = [
+ "archive-trait",
+ "tar-framing",
+ "thiserror 2.0.20",
+ "tokio",
+]
+
+[[package]]
+name = "tar-framing"
+version = "0.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "563e8181b47c9cdcce569eae3ad431eec71543d6269dd60c7bd2350f70bcd233"
+dependencies = [
+ "thiserror 2.0.20",
+ "tokio",
+]
+
 [[package]]
 name = "teams-cli"
-version = "0.2.5"
+version = "0.2.6"
 dependencies = [
  "assert_cmd",
+ "async-compression",
  "base64 0.23.1",
  "clap",
  "clap_complete",
@@ -3210,6 +3360,7 @@ dependencies = [
  "serde_json",
  "sha2",
  "tar",
+ "tar-codec",
  "tempfile",
  "thiserror 2.0.20",
  "tokio",
@@ -3229,7 +3380,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "once_cell",
  "rustix",
  "windows-sys 0.61.2",
@@ -4121,6 +4272,16 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
 
+[[package]]
+name = "winx"
+version = "0.36.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f3fd376f71958b862e7afb20cfe5a22830e1963462f3a17f49d82a6c1d1f42d"
+dependencies = [
+ "bitflags 2.13.1",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "wiremock"
 version = "0.6.5"

{teams_cli-0.2.5 → teams_cli-0.2.6}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "teams-cli"
-version = "0.2.5"
+version = "0.2.6"
 edition = "2024"
 rust-version = "1.90"
 description = "A Microsoft Teams CLI and TUI designed equally for humans and agents"
@@ -22,12 +22,12 @@ name = "teams-cli"
 path = "src/teams_cli_alias.rs"
 
 [dependencies]
+async-compression = { version = "0.4", features = ["tokio", "gzip"] }
 base64 = "0.23"
 clap = { version = "4", features = ["derive", "env"] }
 clap_complete = "4"
 crossterm = "0.29"
 dirs = "6"
-flate2 = "1"
 futures-util = { version = "0.3", default-features = false, features = ["sink"] }
 keyring = { version = "3", features = ["apple-native", "windows-native", "sync-secret-service", "vendored"] }
 open = "5"
@@ -37,7 +37,7 @@ reqwest = { version = "0.13", default-features = false, features = ["rustls", "j
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 sha2 = "0.10"
-tar = "0.4"
+tar-codec = "=0.0.15"
 thiserror = "2"
 tempfile = "3"
 tokio = { version = "1", features = ["macros", "rt-multi-thread", "net", "io-util", "time", "process", "io-std"] }
@@ -64,6 +64,8 @@ windows-sys = { version = "0.61", features = [
 libc = "0.2"
 
 [dev-dependencies]
+flate2 = "1"
+tar = "0.4"
 assert_cmd = "2"
 jsonschema = "0.49.8"
 predicates = "3"

{teams_cli-0.2.5 → teams_cli-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: teams-cli
-Version: 0.2.5
+Version: 0.2.6
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 License-File: LICENSE
@@ -24,6 +24,16 @@ For humans, no arguments open guided onboarding on first use and the TUI afterwa
 
 ## Install
 
+### Homebrew
+
+```sh
+brew install rvben/tap/teams-cli
+```
+
+Homebrew installs native binaries on macOS and builds from source on Linux.
+
+### Other installation methods
+
 ```console
 pipx install teams-cli
 # or

{teams_cli-0.2.5 → teams_cli-0.2.6}/README.md

@@ -8,6 +8,16 @@ For humans, no arguments open guided onboarding on first use and the TUI afterwa
 
 ## Install
 
+### Homebrew
+
+```sh
+brew install rvben/tap/teams-cli
+```
+
+Homebrew installs native binaries on macOS and builds from source on Linux.
+
+### Other installation methods
+
 ```console
 pipx install teams-cli
 # or

{teams_cli-0.2.5 → teams_cli-0.2.6}/src/desktop/install.rs

@@ -3,10 +3,11 @@
 use crate::error::AppError;
 use sha2::{Digest, Sha256};
 use std::{
-    io::Read,
     path::{Path, PathBuf},
     time::Duration,
 };
+use tar_codec::{Archive as _, Member, MemberPayload as _, TarArchive};
+use tokio::io::AsyncReadExt as _;
 
 use super::helper::PROTOCOL;
 
@@ -133,7 +134,15 @@ async fn ensure_state(state: HelperState, version: &str) -> Result<PathBuf, AppE
             "{asset} does not match its published checksum; nothing was installed"
         )));
     }
-    install(&path, &extract(&archive)?)?;
+    // Member payloads borrow the decoder across awaits. Parse on a blocking
+    // worker so the downloader remains Send on Rust 1.90, and decompression
+    // does not occupy an async runtime worker.
+    let helper = tokio::task::spawn_blocking(move || {
+        tokio::runtime::Handle::current().block_on(extract(&archive))
+    })
+    .await
+    .map_err(|_| AppError::Desktop("could not read the helper archive".into()))??;
+    install(&path, &helper)?;
     Ok(path)
 }
 
@@ -192,30 +201,73 @@ fn checksum(sums: &str, name: &str) -> Option<String> {
     })
 }
 
-/// Only `teams.exe` is taken from the archive.
-fn extract(archive: &[u8]) -> Result<Vec<u8>, AppError> {
+/// Only one top-level `teams.exe` is accepted. Validate the entire archive
+/// before installing it, including entries after the executable and gzip CRC.
+async fn extract(archive: &[u8]) -> Result<Vec<u8>, AppError> {
     let invalid = || AppError::Desktop("the helper archive is not valid".into());
-    let mut entries = tar::Archive::new(flate2::read::GzDecoder::new(archive));
-    for entry in entries.entries().map_err(|_| invalid())? {
-        let entry = entry.map_err(|_| invalid())?;
-        let is_helper = entry.header().entry_type().is_file()
-            && entry.path().ok().is_some_and(|p| {
-                p.components().filter(|c| c.as_os_str() != ".").count() == 1
-                    && p.file_name().is_some_and(|n| n == "teams.exe")
-            });
-        if is_helper {
-            let mut bytes = Vec::new();
-            entry
-                .take(MAX_ARCHIVE as u64 + 1)
-                .read_to_end(&mut bytes)
-                .map_err(|_| invalid())?;
-            if bytes.len() > MAX_ARCHIVE || !bytes.starts_with(b"MZ") {
+    if archive.len() > MAX_ARCHIVE {
+        return Err(invalid());
+    }
+    let mut reader =
+        async_compression::tokio::bufread::GzipDecoder::new(archive).take(MAX_ARCHIVE as u64 + 1);
+    let mut helper = None;
+    {
+        let mut entries = TarArchive::new(&mut reader).members();
+        let mut chunk = Vec::new();
+        while let Some(entry) = entries.next().await.map_err(|_| invalid())? {
+            if let Member::File {
+                metadata,
+                size,
+                mut payload,
+                ..
+            } = entry
+            {
+                // Match the release layout without normalizing away traversal.
+                let is_helper = matches!(metadata.path.as_str(), "teams.exe" | "./teams.exe");
+                if is_helper {
+                    if helper.is_some() || size > MAX_ARCHIVE as u64 {
+                        return Err(invalid());
+                    }
+                    let mut bytes = Vec::new();
+                    while payload
+                        .next_chunk(&mut chunk, 64 * 1024)
+                        .await
+                        .map_err(|_| invalid())?
+                    {
+                        if bytes.len() + chunk.len() > MAX_ARCHIVE {
+                            return Err(invalid());
+                        }
+                        bytes.extend_from_slice(&chunk);
+                    }
+                    if !bytes.starts_with(b"MZ") {
+                        return Err(invalid());
+                    }
+                    helper = Some(bytes);
+                } else {
+                    payload.skip().await.map_err(|_| invalid())?;
+                }
+            } else if !matches!(entry, Member::Directory { .. }) {
+                // Release packages contain only directories and regular files.
                 return Err(invalid());
             }
-            return Ok(bytes);
         }
     }
-    Err(invalid())
+    // The tar end marker can precede padding and the gzip trailer. Reading to
+    // EOF also makes the decompressed-size budget cover ignored archive data.
+    let mut padding = [0; 8192];
+    loop {
+        let read = reader.read(&mut padding).await.map_err(|_| invalid())?;
+        if read == 0 {
+            break;
+        }
+        if padding[..read].iter().any(|&byte| byte != 0) {
+            return Err(invalid());
+        }
+    }
+    if reader.limit() == 0 || !reader.get_ref().get_ref().is_empty() {
+        return Err(invalid());
+    }
+    helper.ok_or_else(invalid)
 }
 
 /// Writes atomically, marks it executable for WSL interop, and removes other versions.
@@ -249,6 +301,12 @@ fn install(path: &Path, bytes: &[u8]) -> Result<(), AppError> {
 mod tests {
     use super::*;
 
+    #[test]
+    fn helper_downloader_can_be_sent_between_runtime_workers() {
+        fn assert_send(_: impl Send) {}
+        assert_send(ensure());
+    }
+
     #[tokio::test]
     async fn legacy_release_needs_a_built_helper_but_accepts_explicit_or_cached_builds() {
         let temp = tempfile::tempdir().unwrap();
@@ -299,14 +357,145 @@ mod tests {
         assert_eq!(hex(&[0, 15, 255]), "000fff");
     }
 
-    #[test]
-    fn extracts_only_the_top_level_windows_executable() {
+    #[tokio::test]
+    async fn extracts_only_the_top_level_windows_executable() {
         let exe = b"MZ fixture";
         let bytes = archive(&[("./README.md", b"readme"), ("./teams.exe", exe)]);
-        assert_eq!(extract(&bytes).unwrap(), exe);
-        assert!(extract(&archive(&[("./nested/teams.exe", exe)])).is_err());
-        assert!(extract(&archive(&[("./teams.exe", b"#!/bin/sh")])).is_err());
-        assert!(extract(b"not an archive").is_err());
+        assert_eq!(extract(&bytes).await.unwrap(), exe);
+        assert!(
+            extract(&archive(&[("./nested/teams.exe", exe)]))
+                .await
+                .is_err()
+        );
+        assert!(
+            extract(&archive(&[("./teams.exe", b"#!/bin/sh")]))
+                .await
+                .is_err()
+        );
+        assert!(extract(b"not an archive").await.is_err());
+    }
+
+    #[tokio::test]
+    async fn extracts_a_helper_across_multiple_payload_chunks() {
+        let mut exe = vec![0x5a; 3 * 64 * 1024 + 17];
+        exe[..2].copy_from_slice(b"MZ");
+        assert_eq!(
+            extract(&archive(&[("teams.exe", &exe)])).await.unwrap(),
+            exe
+        );
+    }
+
+    #[cfg(unix)]
+    #[tokio::test]
+    async fn accepts_the_release_workflows_system_tar_packaging() {
+        let temp = tempfile::tempdir().unwrap();
+        let package = temp.path().join("package");
+        std::fs::create_dir(&package).unwrap();
+        std::fs::write(package.join("teams.exe"), b"MZ release fixture").unwrap();
+        std::fs::write(package.join("README.md"), b"readme").unwrap();
+        let output = temp.path().join("helper.tar.gz");
+        // Match .github/workflows/release.yml, including the '.' root entry.
+        assert!(
+            std::process::Command::new("tar")
+                .arg("-C")
+                .arg(&package)
+                .arg("-czf")
+                .arg(&output)
+                .arg(".")
+                .status()
+                .unwrap()
+                .success()
+        );
+        assert_eq!(
+            extract(&std::fs::read(output).unwrap()).await.unwrap(),
+            b"MZ release fixture"
+        );
+    }
+
+    #[tokio::test]
+    async fn rejects_duplicate_helpers_and_damage_after_the_helper() {
+        let duplicate = archive(&[("teams.exe", b"MZ first"), ("./teams.exe", b"MZ second")]);
+        assert!(extract(&duplicate).await.is_err());
+
+        let mut damaged = archive(&[("teams.exe", b"MZ fixture")]);
+        let crc = damaged.len() - 8;
+        damaged[crc] ^= 1;
+        assert!(extract(&damaged).await.is_err(), "gzip CRC must be checked");
+        damaged.truncate(crc);
+        assert!(
+            extract(&damaged).await.is_err(),
+            "missing trailer must fail"
+        );
+
+        // A malformed second tar header must not be hidden by finding the
+        // executable first. Recompress so the gzip checksum remains valid.
+        use std::io::{Read as _, Write as _};
+        let valid = archive(&[("teams.exe", b"MZ fixture"), ("README.md", b"readme")]);
+        let mut raw = Vec::new();
+        flate2::read::GzDecoder::new(valid.as_slice())
+            .read_to_end(&mut raw)
+            .unwrap();
+        raw[1024] ^= 1;
+        let mut gz = flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::fast());
+        gz.write_all(&raw).unwrap();
+        assert!(extract(&gz.finish().unwrap()).await.is_err());
+
+        let mut trailing = archive(&[("teams.exe", b"MZ fixture")]);
+        trailing.extend_from_slice(b"junk");
+        assert!(
+            extract(&trailing).await.is_err(),
+            "trailing compressed data must fail"
+        );
+
+        let mut concatenated = archive(&[("teams.exe", b"MZ first")]);
+        concatenated.extend_from_slice(&archive(&[("teams.exe", b"MZ second")]));
+        assert!(
+            extract(&concatenated).await.is_err(),
+            "multiple gzip streams must fail"
+        );
+    }
+
+    #[tokio::test]
+    async fn rejects_links_even_after_a_valid_helper() {
+        let mut builder = tar::Builder::new(flate2::write::GzEncoder::new(
+            Vec::new(),
+            flate2::Compression::fast(),
+        ));
+        let mut file = tar::Header::new_gnu();
+        file.set_size(2);
+        file.set_mode(0o644);
+        builder
+            .append_data(&mut file, "teams.exe", &b"MZ"[..])
+            .unwrap();
+        let mut link = tar::Header::new_gnu();
+        link.set_entry_type(tar::EntryType::Symlink);
+        link.set_size(0);
+        link.set_mode(0o777);
+        builder
+            .append_link(&mut link, "other", "teams.exe")
+            .unwrap();
+        let bytes = builder.into_inner().unwrap().finish().unwrap();
+        assert!(extract(&bytes).await.is_err());
+    }
+
+    #[tokio::test]
+    async fn bounds_decompressed_data_including_ignored_files_and_padding() {
+        // Compressed input is small, but ignored payloads still consume the
+        // same total budget as the helper itself.
+        let bytes = archive(&[("README.md", &vec![0; MAX_ARCHIVE]), ("teams.exe", b"MZ")]);
+        assert!(bytes.len() < MAX_ARCHIVE);
+        assert!(extract(&bytes).await.is_err());
+
+        use std::io::{Read as _, Write as _};
+        let valid = archive(&[("teams.exe", b"MZ")]);
+        let mut raw = Vec::new();
+        flate2::read::GzDecoder::new(valid.as_slice())
+            .read_to_end(&mut raw)
+            .unwrap();
+        raw.resize(MAX_ARCHIVE + 1, 0);
+        let mut gz = flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::fast());
+        gz.write_all(&raw).unwrap();
+        assert!(extract(&gz.finish().unwrap()).await.is_err());
     }
 
     #[test]

{teams_cli-0.2.5 → teams_cli-0.2.6}/src/desktop/macos.rs

@@ -132,14 +132,20 @@ fn parse_processes(text: &str) -> Result<HashMap<u32, Process>, AppError> {
         .map(|line| {
             let invalid = || AppError::Desktop("invalid process ancestry metadata".into());
             let mut rest = line.trim();
-            let mut number = || {
+            let mut field = || {
                 let (value, tail) = rest.split_once(char::is_whitespace).ok_or_else(invalid)?;
                 rest = tail.trim_start();
-                value.parse::<u32>().map_err(|_| invalid())
+                Ok::<_, AppError>(value)
             };
-            let pid = number()?;
-            let uid = number()?;
-            let parent = number()?;
+            let pid = field()?.parse::<u32>().map_err(|_| invalid())?;
+            let uid = field()?;
+            // macOS ps prints some uid_t values as signed integers (for
+            // example nobody as -2). Preserve their underlying 32-bit value.
+            let uid = uid
+                .parse::<u32>()
+                .or_else(|_| uid.parse::<i32>().map(|uid| uid as u32))
+                .map_err(|_| invalid())?;
+            let parent = field()?.parse::<u32>().map_err(|_| invalid())?;
             if rest.is_empty() {
                 return Err(invalid());
             }
@@ -184,6 +190,28 @@ fn teams_owner(
 mod tests {
     use super::*;
 
+    #[test]
+    fn signed_system_uids_do_not_break_listener_ownership_checks() {
+        let installed = [PathBuf::from("/Applications/Teams")];
+        let processes = parse_processes(
+            "1 0 0 /sbin/launchd\n2 -2 1 /system/service\n3 501 1 /Applications/Teams\n4 -2 3 /helper\n5 4294967294 1 /system/service\n",
+        )
+        .unwrap();
+        assert_eq!(processes[&2].uid, u32::MAX - 1);
+        assert_eq!(processes[&5].uid, processes[&2].uid);
+        assert!(teams_owner(&processes, 3, 501, &installed));
+        assert!(!teams_owner(&processes, 2, 501, &installed));
+        assert!(!teams_owner(&processes, 4, 501, &installed));
+        for malformed in [
+            "-2 501 1 /process",
+            "2 -2147483649 1 /process",
+            "2 4294967296 1 /process",
+            "2 501 -1 /process",
+        ] {
+            assert!(parse_processes(malformed).is_err());
+        }
+    }
+
     #[test]
     fn ownership_requires_the_installed_path_and_current_user_throughout_the_chain() {
         let installed = [PathBuf::from(

{teams_cli-0.2.5 → teams_cli-0.2.6}/src/desktop.rs

@@ -1278,7 +1278,7 @@ mod tests {
                 "9c000776f04a",
                 "baa0bc29c44b",
                 "7d2b70751d6a",
-                "23b1a0e4b293"
+                "a29e305b13a4"
             ]
         );
     }

{teams_cli-0.2.5 → teams_cli-0.2.6}/src/desktop_people.js

@@ -76,29 +76,6 @@ async (p, select) => {
     ],
   });
   if (p.op === "search") {
-    const query = operationDoc(
-      "query",
-      "TeamsCliSearchPeople",
-      [
-        ["searchQuery", "String"],
-        ["peoplePickerFilters", "PeoplePickerFiltersInput"],
-      ],
-      [
-        F(
-          "searchUsers",
-          [
-            "id",
-            "displayName",
-            "email",
-            "mri",
-            "userPrincipalName",
-            "type",
-            "userType",
-          ],
-          ["searchQuery", "peoplePickerFilters"],
-        ),
-      ],
-    );
     const filters = {
       name: "newChat",
       includeAADTenant: true,
@@ -211,13 +188,43 @@ async (p, select) => {
           users.unshift(...found.data.instantScdSearch);
         }
       } else {
+        // Work accounts search the directory the way Teams' people picker does.
+        // searchUsers answers empty there, and instantScdSearch is refused.
+        const query = operationDoc(
+          "query",
+          "TeamsCliSearchPeople",
+          [
+            ["searchQuery", "String"],
+            ["peoplePickerFilters", "PeoplePickerFiltersInput"],
+          ],
+          [
+            F(
+              "searchSuggestionsForPeoplePicker",
+              [F("peopleResults", fields)],
+              ["searchQuery", "peoplePickerFilters"],
+            ),
+          ],
+        );
         const r = await client.query({
           query,
-          variables: { searchQuery: p.query, peoplePickerFilters: filters },
-          fetchPolicy: "network-only",
+          variables: {
+            searchQuery: p.query,
+            peoplePickerFilters: {
+              ...filters,
+              includeFeatures: [
+                "AADTenant",
+                "Guest",
+                "B2BMembers",
+                "Federated",
+                "FederatedConsumer",
+              ],
+            },
+          },
+          fetchPolicy: "no-cache",
         });
-        users = r.data?.searchUsers;
-        if (!Array.isArray(users)) return { error: "layout" };
+        const sets = r.data?.searchSuggestionsForPeoplePicker;
+        if (!Array.isArray(sets)) return { error: "layout" };
+        users = sets.flatMap((set) => set?.peopleResults || []);
       }
       const seen = new Set(),
         items = [];

{teams_cli-0.2.5 → teams_cli-0.2.6}/tests/js/people.test.mjs

@@ -4,7 +4,7 @@ import fs from 'node:fs';
 import vm from 'node:vm';
 const source=fs.readFileSync(new URL('../../src/desktop_people.js',import.meta.url),'utf8');
 function fixture({existing=false,failQuery=false,failMutation=false,policy=false,wrongMembers=false,cached,live}={}){
- const calls=[];const client={query:async r=>{calls.push(['query',r]);if(failQuery)throw Error();const name=r.query.definitions[0].selectionSet.selections[0].name.value;return{data:{[name]: name==='chatsWithUsers'?(existing?[{id:'19:existing@thread.v2',memberIds:wrongMembers?['8:live:other','8:live:me']:['8:live:person','8:live:me']}]:[]):name==='getCacheResults'?(cached??{peopleResults:[{id:'8:live:person',displayName:'Person'}]}):(live??[{id:'8:live:person',displayName:'Person'}])}}},mutate:async r=>{calls.push(['mutate',r]);if(failMutation)throw Error();return{data:{createChat:{conversation:{id:'19:new@thread.v2',memberIds:['8:live:me','8:live:person']},hasIBPolicyRejectedUsers:policy}}}}};
+ const calls=[];const client={query:async r=>{calls.push(['query',r]);if(failQuery)throw Error();const name=r.query.definitions[0].selectionSet.selections[0].name.value;return{data:{[name]: name==='chatsWithUsers'?(existing?[{id:'19:existing@thread.v2',memberIds:wrongMembers?['8:live:other','8:live:me']:['8:live:person','8:live:me']}]:[]):name==='getCacheResults'?(cached??{peopleResults:[{id:'8:live:person',displayName:'Person'}]}):name==='searchSuggestionsForPeoplePicker'?[{peopleResults:[]},{peopleResults:live??[{id:'8:live:person',displayName:'Person'}]}]:(live??[{id:'8:live:person',displayName:'Person'}])}}},mutate:async r=>{calls.push(['mutate',r]);if(failMutation)throw Error();return{data:{createChat:{conversation:{id:'19:new@thread.v2',memberIds:['8:live:me','8:live:person']},hasIBPolicyRejectedUsers:policy}}}}};
  const req=result=>{const q={result};queueMicrotask(()=>q.onsuccess?.());return q};
  const db={transaction:()=>({objectStore:()=>({getAll:()=>req([{objectId:'account',mri:'8:live:me'}])})}),close(){}};
  const run=vm.runInNewContext(`(${source})`,{window:{__teamsCliCore:{ready:true,client}},indexedDB:{databases:async()=>[],open:()=>req(db)}});
@@ -35,3 +35,4 @@ test('cached suggestions must match every search term and live metadata takes pr
  const none=fixture({cached:{mfuContactsResults:[{id:'8:live:wrong',displayName:'Unrelated'}]},live:[]});
  assert.equal((await none.run({op:'search',personal:true,query:'absent@example.test',limit:20})).items.length,0);
 });
+test('work search reads people from every people picker result set without mutation',async()=>{const f=fixture({live:[{mri:'8:orgid:person',id:'person',displayName:'Person'},{id:'not-an-mri'}]});const r=await f.run({op:'search',personal:false,query:'Person',limit:20});assert.deepEqual(Array.from(r.items,i=>i.id),['8:orgid:person']);assert.equal(f.calls.length,1);assert.equal(f.calls[0][1].query.definitions[0].selectionSet.selections[0].name.value,'searchSuggestionsForPeoplePicker');assert.equal(f.calls[0][1].variables.searchQuery,'Person')});