Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions tests/default_stubs/tests/default.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,15 @@ async fn test_default_stubs_uds() {
test_default_stubs(client, client_default_stubs).await;
}

#[tokio::test()]
#[cfg(any(target_os = "linux", target_os = "android"))]
async fn test_default_stubs_uds_abstract() {
let addrs = run_services_in_background_uds_abstract().await;
let client = test_client::TestClient::connect(addrs.0).await.unwrap();
let client_default_stubs = test_client::TestClient::connect(addrs.1).await.unwrap();
test_default_stubs(client, client_default_stubs).await;
}

async fn run_services_in_background() -> (SocketAddr, SocketAddr) {
let svc = test_server::TestServer::new(Svc {});
let svc_default_stubs = test_default_server::TestDefaultServer::new(Svc {});
Expand Down Expand Up @@ -190,3 +199,40 @@ async fn run_services_in_background_uds() -> (String, String) {

(uds_addr, uds_default_stubs_addr)
}

#[cfg(any(target_os = "linux", target_os = "android"))]
async fn run_services_in_background_uds_abstract() -> (String, String) {
use tokio::net::UnixListener;

let svc = test_server::TestServer::new(Svc {});
let svc_default_stubs = test_default_server::TestDefaultServer::new(Svc {});

let pid = std::process::id();
let impl_name = format!("tonic-test-{pid}-impl.sock");
let listener = UnixListener::bind(format!("\0{impl_name}")).unwrap();
let uds_addr = format!("unix-abstract:{impl_name}");

let stub_name = format!("tonic-test-{pid}-stub.sock");
let listener_default_stubs = UnixListener::bind(format!("\0{stub_name}")).unwrap();
let uds_default_stubs_addr = format!("unix-abstract://{stub_name}");

tokio::spawn(async move {
Server::builder()
.add_service(svc)
.serve_with_incoming(tokio_stream::wrappers::UnixListenerStream::new(listener))
.await
.unwrap();
});

tokio::spawn(async move {
Server::builder()
.add_service(svc_default_stubs)
.serve_with_incoming(tokio_stream::wrappers::UnixListenerStream::new(
listener_default_stubs,
))
.await
.unwrap();
});

(uds_addr, uds_default_stubs_addr)
}
12 changes: 12 additions & 0 deletions tonic/src/transport/channel/endpoint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,12 @@ impl Endpoint {
.or_else(|| s.strip_prefix("unix:"))
.expect("Invalid unix domain socket URI");
Self::new_uds(uds_filepath)
} else if s.starts_with("unix-abstract:") {
let uds_filepath = s
.strip_prefix("unix-abstract://")
.or_else(|| s.strip_prefix("unix-abstract:"))
.expect("Invalid unix abstract domain socket URI");
Self::new_uds(&format!("\0{uds_filepath}"))
} else {
let uri = Uri::from_static(s);
Self::new_uri(uri)
Expand All @@ -212,6 +218,12 @@ impl Endpoint {
.or_else(|| s.strip_prefix("unix:"))
.ok_or(Error::new_invalid_uri())?;
Ok(Self::new_uds(uds_filepath))
} else if s.starts_with("unix-abstract:") {
let uds_filepath = s
.strip_prefix("unix-abstract://")
.or_else(|| s.strip_prefix("unix-abstract:"))
.ok_or(Error::new_invalid_uri())?;
Ok(Self::new_uds(&format!("\0{uds_filepath}")))
} else {
let uri = Uri::from_maybe_shared(s).map_err(|e| Error::new_invalid_uri().with(e))?;
Ok(Self::from(uri))
Expand Down
7 changes: 7 additions & 0 deletions tonic/src/transport/channel/uds_connector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ use tokio::net::UnixStream;

#[cfg(not(target_os = "windows"))]
async fn connect_uds(uds_path: String) -> Result<UnixStream, ConnectError> {
#[cfg(not(any(target_os = "linux", target_os = "android")))]
if uds_path.starts_with('\0') {
return Err(ConnectError(
"abstract uds connections are only allowed on linux and android".into(),
));
}

UnixStream::connect(uds_path)
.await
.map_err(|err| ConnectError(From::from(err)))
Expand Down
Loading