2020-01-02 15:13:47 -05:00
|
|
|
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
|
2019-09-23 14:40:38 -04:00
|
|
|
use super::dispatch_json::{Deserialize, JsonOp, Value};
|
2019-11-14 12:10:25 -05:00
|
|
|
use super::io::StreamResource;
|
2019-11-07 09:59:02 -05:00
|
|
|
use crate::deno_error::bad_resource;
|
2019-10-21 14:38:28 -04:00
|
|
|
use crate::deno_error::DenoError;
|
|
|
|
use crate::deno_error::ErrorKind;
|
2019-10-13 10:37:37 -04:00
|
|
|
use crate::ops::json_op;
|
2019-09-23 14:40:38 -04:00
|
|
|
use crate::resolve_addr::resolve_addr;
|
2020-02-08 14:34:31 -05:00
|
|
|
use crate::state::State;
|
2020-01-05 11:56:18 -05:00
|
|
|
use deno_core::*;
|
2019-11-16 19:17:47 -05:00
|
|
|
use futures::future::FutureExt;
|
2019-09-23 14:40:38 -04:00
|
|
|
use std;
|
|
|
|
use std::convert::From;
|
2019-10-21 14:38:28 -04:00
|
|
|
use std::fs::File;
|
2019-11-16 19:17:47 -05:00
|
|
|
use std::future::Future;
|
2019-10-21 14:38:28 -04:00
|
|
|
use std::io::BufReader;
|
2019-11-07 09:59:02 -05:00
|
|
|
use std::net::SocketAddr;
|
2020-01-20 09:45:44 -05:00
|
|
|
use std::path::Path;
|
2019-11-16 19:17:47 -05:00
|
|
|
use std::pin::Pin;
|
2019-09-23 14:40:38 -04:00
|
|
|
use std::sync::Arc;
|
2019-11-16 19:17:47 -05:00
|
|
|
use std::task::Context;
|
|
|
|
use std::task::Poll;
|
2019-09-23 14:40:38 -04:00
|
|
|
use tokio;
|
2019-10-21 14:38:28 -04:00
|
|
|
use tokio::net::TcpListener;
|
2019-09-23 14:40:38 -04:00
|
|
|
use tokio::net::TcpStream;
|
|
|
|
use tokio_rustls::{rustls::ClientConfig, TlsConnector};
|
2019-10-21 14:38:28 -04:00
|
|
|
use tokio_rustls::{
|
|
|
|
rustls::{
|
|
|
|
internal::pemfile::{certs, pkcs8_private_keys, rsa_private_keys},
|
|
|
|
Certificate, NoClientAuth, PrivateKey, ServerConfig,
|
|
|
|
},
|
|
|
|
TlsAcceptor,
|
|
|
|
};
|
2019-09-23 14:40:38 -04:00
|
|
|
use webpki;
|
|
|
|
use webpki::DNSNameRef;
|
|
|
|
use webpki_roots;
|
|
|
|
|
2020-02-08 14:34:31 -05:00
|
|
|
pub fn init(i: &mut Isolate, s: &State) {
|
2020-01-18 12:35:12 -05:00
|
|
|
i.register_op(
|
|
|
|
"connect_tls",
|
|
|
|
s.core_op(json_op(s.stateful_op(op_connect_tls))),
|
|
|
|
);
|
2019-10-21 14:38:28 -04:00
|
|
|
i.register_op(
|
|
|
|
"listen_tls",
|
|
|
|
s.core_op(json_op(s.stateful_op(op_listen_tls))),
|
|
|
|
);
|
|
|
|
i.register_op(
|
|
|
|
"accept_tls",
|
|
|
|
s.core_op(json_op(s.stateful_op(op_accept_tls))),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2019-09-23 14:40:38 -04:00
|
|
|
#[derive(Deserialize)]
|
2019-10-21 14:38:28 -04:00
|
|
|
#[serde(rename_all = "camelCase")]
|
2020-01-18 12:35:12 -05:00
|
|
|
struct ConnectTLSArgs {
|
2020-01-18 15:49:55 -05:00
|
|
|
transport: String,
|
2019-09-23 14:40:38 -04:00
|
|
|
hostname: String,
|
|
|
|
port: u16,
|
2019-10-21 14:38:28 -04:00
|
|
|
cert_file: Option<String>,
|
2019-10-13 10:37:37 -04:00
|
|
|
}
|
2019-09-23 14:40:38 -04:00
|
|
|
|
2020-01-18 12:35:12 -05:00
|
|
|
pub fn op_connect_tls(
|
2020-02-08 14:34:31 -05:00
|
|
|
state: &State,
|
2019-09-23 14:40:38 -04:00
|
|
|
args: Value,
|
2020-01-24 15:10:49 -05:00
|
|
|
_zero_copy: Option<ZeroCopyBuf>,
|
2019-09-23 14:40:38 -04:00
|
|
|
) -> Result<JsonOp, ErrBox> {
|
2020-01-18 12:35:12 -05:00
|
|
|
let args: ConnectTLSArgs = serde_json::from_value(args)?;
|
2019-12-30 08:57:17 -05:00
|
|
|
let cert_file = args.cert_file.clone();
|
2019-11-14 12:10:25 -05:00
|
|
|
let state_ = state.clone();
|
2019-10-23 10:19:27 -04:00
|
|
|
state.check_net(&args.hostname, args.port)?;
|
2019-10-21 14:38:28 -04:00
|
|
|
if let Some(path) = cert_file.clone() {
|
2020-01-20 09:45:44 -05:00
|
|
|
state.check_read(Path::new(&path))?;
|
2019-10-21 14:38:28 -04:00
|
|
|
}
|
2019-09-23 14:40:38 -04:00
|
|
|
|
2019-10-23 10:19:27 -04:00
|
|
|
let mut domain = args.hostname.clone();
|
2019-09-23 14:40:38 -04:00
|
|
|
if domain.is_empty() {
|
|
|
|
domain.push_str("localhost");
|
|
|
|
}
|
|
|
|
|
2019-12-30 08:57:17 -05:00
|
|
|
let op = async move {
|
|
|
|
let addr = resolve_addr(&args.hostname, args.port).await?;
|
|
|
|
let tcp_stream = TcpStream::connect(&addr).await?;
|
|
|
|
let local_addr = tcp_stream.local_addr()?;
|
|
|
|
let remote_addr = tcp_stream.peer_addr()?;
|
|
|
|
let mut config = ClientConfig::new();
|
|
|
|
config
|
|
|
|
.root_store
|
|
|
|
.add_server_trust_anchors(&webpki_roots::TLS_SERVER_ROOTS);
|
|
|
|
if let Some(path) = cert_file {
|
|
|
|
let key_file = File::open(path)?;
|
|
|
|
let reader = &mut BufReader::new(key_file);
|
|
|
|
config.root_store.add_pem_file(reader).unwrap();
|
|
|
|
}
|
|
|
|
let tls_connector = TlsConnector::from(Arc::new(config));
|
|
|
|
let dnsname =
|
|
|
|
DNSNameRef::try_from_ascii_str(&domain).expect("Invalid DNS lookup");
|
|
|
|
let tls_stream = tls_connector.connect(dnsname, tcp_stream).await?;
|
2020-02-08 14:34:31 -05:00
|
|
|
let mut state = state_.borrow_mut();
|
|
|
|
let rid = state.resource_table.add(
|
2019-12-30 08:57:17 -05:00
|
|
|
"clientTlsStream",
|
|
|
|
Box::new(StreamResource::ClientTlsStream(Box::new(tls_stream))),
|
|
|
|
);
|
|
|
|
Ok(json!({
|
|
|
|
"rid": rid,
|
2020-01-18 15:49:55 -05:00
|
|
|
"localAddr": {
|
|
|
|
"hostname": local_addr.ip().to_string(),
|
|
|
|
"port": local_addr.port(),
|
|
|
|
"transport": args.transport,
|
|
|
|
},
|
|
|
|
"remoteAddr": {
|
|
|
|
"hostname": remote_addr.ip().to_string(),
|
|
|
|
"port": remote_addr.port(),
|
|
|
|
"transport": args.transport,
|
|
|
|
}
|
2019-12-30 08:57:17 -05:00
|
|
|
}))
|
|
|
|
};
|
2019-09-23 14:40:38 -04:00
|
|
|
|
2020-02-03 18:08:44 -05:00
|
|
|
Ok(JsonOp::Async(op.boxed_local()))
|
2019-09-23 14:40:38 -04:00
|
|
|
}
|
2019-10-21 14:38:28 -04:00
|
|
|
|
|
|
|
fn load_certs(path: &str) -> Result<Vec<Certificate>, ErrBox> {
|
|
|
|
let cert_file = File::open(path)?;
|
|
|
|
let reader = &mut BufReader::new(cert_file);
|
|
|
|
|
|
|
|
let certs = certs(reader).map_err(|_| {
|
|
|
|
DenoError::new(ErrorKind::Other, "Unable to decode certificate".to_string())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
if certs.is_empty() {
|
|
|
|
let e = DenoError::new(
|
|
|
|
ErrorKind::Other,
|
|
|
|
"No certificates found in cert file".to_string(),
|
|
|
|
);
|
|
|
|
return Err(ErrBox::from(e));
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(certs)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn key_decode_err() -> DenoError {
|
|
|
|
DenoError::new(ErrorKind::Other, "Unable to decode key".to_string())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn key_not_found_err() -> DenoError {
|
|
|
|
DenoError::new(ErrorKind::Other, "No keys found in key file".to_string())
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Starts with -----BEGIN RSA PRIVATE KEY-----
|
|
|
|
fn load_rsa_keys(path: &str) -> Result<Vec<PrivateKey>, ErrBox> {
|
|
|
|
let key_file = File::open(path)?;
|
|
|
|
let reader = &mut BufReader::new(key_file);
|
|
|
|
let keys = rsa_private_keys(reader).map_err(|_| key_decode_err())?;
|
|
|
|
Ok(keys)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Starts with -----BEGIN PRIVATE KEY-----
|
|
|
|
fn load_pkcs8_keys(path: &str) -> Result<Vec<PrivateKey>, ErrBox> {
|
|
|
|
let key_file = File::open(path)?;
|
|
|
|
let reader = &mut BufReader::new(key_file);
|
|
|
|
let keys = pkcs8_private_keys(reader).map_err(|_| key_decode_err())?;
|
|
|
|
Ok(keys)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn load_keys(path: &str) -> Result<Vec<PrivateKey>, ErrBox> {
|
|
|
|
let path = path.to_string();
|
|
|
|
let mut keys = load_rsa_keys(&path)?;
|
|
|
|
|
|
|
|
if keys.is_empty() {
|
|
|
|
keys = load_pkcs8_keys(&path)?;
|
|
|
|
}
|
|
|
|
|
|
|
|
if keys.is_empty() {
|
|
|
|
return Err(ErrBox::from(key_not_found_err()));
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(keys)
|
|
|
|
}
|
|
|
|
|
2019-11-07 09:59:02 -05:00
|
|
|
#[allow(dead_code)]
|
|
|
|
pub struct TlsListenerResource {
|
2019-12-30 08:57:17 -05:00
|
|
|
listener: TcpListener,
|
2019-11-07 09:59:02 -05:00
|
|
|
tls_acceptor: TlsAcceptor,
|
2019-11-16 19:17:47 -05:00
|
|
|
waker: Option<futures::task::AtomicWaker>,
|
2019-11-07 09:59:02 -05:00
|
|
|
local_addr: SocketAddr,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Drop for TlsListenerResource {
|
|
|
|
fn drop(&mut self) {
|
2019-11-16 19:17:47 -05:00
|
|
|
self.wake_task();
|
2019-11-07 09:59:02 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl TlsListenerResource {
|
|
|
|
/// Track the current task so future awaiting for connection
|
|
|
|
/// can be notified when listener is closed.
|
|
|
|
///
|
|
|
|
/// Throws an error if another task is already tracked.
|
2019-11-16 19:17:47 -05:00
|
|
|
pub fn track_task(&mut self, cx: &Context) -> Result<(), ErrBox> {
|
2019-11-07 09:59:02 -05:00
|
|
|
// Currently, we only allow tracking a single accept task for a listener.
|
|
|
|
// This might be changed in the future with multiple workers.
|
|
|
|
// Caveat: TcpListener by itself also only tracks an accept task at a time.
|
|
|
|
// See https://github.com/tokio-rs/tokio/issues/846#issuecomment-454208883
|
2019-11-16 19:17:47 -05:00
|
|
|
if self.waker.is_some() {
|
2019-11-07 09:59:02 -05:00
|
|
|
let e = std::io::Error::new(
|
|
|
|
std::io::ErrorKind::Other,
|
|
|
|
"Another accept task is ongoing",
|
|
|
|
);
|
|
|
|
return Err(ErrBox::from(e));
|
|
|
|
}
|
|
|
|
|
2019-11-16 19:17:47 -05:00
|
|
|
let waker = futures::task::AtomicWaker::new();
|
|
|
|
waker.register(cx.waker());
|
|
|
|
self.waker.replace(waker);
|
2019-11-07 09:59:02 -05:00
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Notifies a task when listener is closed so accept future can resolve.
|
2019-11-16 19:17:47 -05:00
|
|
|
pub fn wake_task(&mut self) {
|
|
|
|
if let Some(waker) = self.waker.as_ref() {
|
|
|
|
waker.wake();
|
2019-11-07 09:59:02 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Stop tracking a task.
|
|
|
|
/// Happens when the task is done and thus no further tracking is needed.
|
|
|
|
pub fn untrack_task(&mut self) {
|
2019-11-16 19:17:47 -05:00
|
|
|
if self.waker.is_some() {
|
|
|
|
self.waker.take();
|
2019-11-07 09:59:02 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-21 14:38:28 -04:00
|
|
|
#[derive(Deserialize)]
|
|
|
|
#[serde(rename_all = "camelCase")]
|
|
|
|
struct ListenTlsArgs {
|
|
|
|
transport: String,
|
|
|
|
hostname: String,
|
|
|
|
port: u16,
|
|
|
|
cert_file: String,
|
|
|
|
key_file: String,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn op_listen_tls(
|
2020-02-08 14:34:31 -05:00
|
|
|
state: &State,
|
2019-10-21 14:38:28 -04:00
|
|
|
args: Value,
|
2020-01-24 15:10:49 -05:00
|
|
|
_zero_copy: Option<ZeroCopyBuf>,
|
2019-10-21 14:38:28 -04:00
|
|
|
) -> Result<JsonOp, ErrBox> {
|
|
|
|
let args: ListenTlsArgs = serde_json::from_value(args)?;
|
|
|
|
assert_eq!(args.transport, "tcp");
|
|
|
|
|
|
|
|
let cert_file = args.cert_file;
|
|
|
|
let key_file = args.key_file;
|
|
|
|
|
2019-10-23 10:19:27 -04:00
|
|
|
state.check_net(&args.hostname, args.port)?;
|
2020-01-20 09:45:44 -05:00
|
|
|
state.check_read(Path::new(&cert_file))?;
|
|
|
|
state.check_read(Path::new(&key_file))?;
|
2019-10-21 14:38:28 -04:00
|
|
|
|
|
|
|
let mut config = ServerConfig::new(NoClientAuth::new());
|
|
|
|
config
|
|
|
|
.set_single_cert(load_certs(&cert_file)?, load_keys(&key_file)?.remove(0))
|
|
|
|
.expect("invalid key or certificate");
|
2019-11-07 09:59:02 -05:00
|
|
|
let tls_acceptor = TlsAcceptor::from(Arc::new(config));
|
2019-11-16 19:17:47 -05:00
|
|
|
let addr =
|
|
|
|
futures::executor::block_on(resolve_addr(&args.hostname, args.port))?;
|
2019-12-30 08:57:17 -05:00
|
|
|
let listener = futures::executor::block_on(TcpListener::bind(&addr))?;
|
2019-10-21 14:38:28 -04:00
|
|
|
let local_addr = listener.local_addr()?;
|
2019-11-07 09:59:02 -05:00
|
|
|
let tls_listener_resource = TlsListenerResource {
|
2019-12-30 08:57:17 -05:00
|
|
|
listener,
|
2019-11-07 09:59:02 -05:00
|
|
|
tls_acceptor,
|
2019-11-16 19:17:47 -05:00
|
|
|
waker: None,
|
2019-11-07 09:59:02 -05:00
|
|
|
local_addr,
|
|
|
|
};
|
2020-02-08 14:34:31 -05:00
|
|
|
let mut state = state.borrow_mut();
|
|
|
|
let rid = state
|
|
|
|
.resource_table
|
|
|
|
.add("tlsListener", Box::new(tls_listener_resource));
|
2019-10-21 14:38:28 -04:00
|
|
|
|
|
|
|
Ok(JsonOp::Sync(json!({
|
2019-11-07 09:59:02 -05:00
|
|
|
"rid": rid,
|
2020-01-18 15:49:55 -05:00
|
|
|
"localAddr": {
|
|
|
|
"hostname": local_addr.ip().to_string(),
|
|
|
|
"port": local_addr.port(),
|
|
|
|
"transport": args.transport,
|
|
|
|
},
|
2019-10-21 14:38:28 -04:00
|
|
|
})))
|
|
|
|
}
|
|
|
|
|
2019-11-07 09:59:02 -05:00
|
|
|
#[derive(Debug, PartialEq)]
|
|
|
|
enum AcceptTlsState {
|
|
|
|
Pending,
|
|
|
|
Done,
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Simply accepts a TLS connection.
|
2020-02-08 14:34:31 -05:00
|
|
|
pub fn accept_tls(state: &State, rid: ResourceId) -> AcceptTls {
|
2019-11-07 09:59:02 -05:00
|
|
|
AcceptTls {
|
2019-12-02 15:21:33 -05:00
|
|
|
accept_state: AcceptTlsState::Pending,
|
2019-11-07 09:59:02 -05:00
|
|
|
rid,
|
2019-11-14 12:10:25 -05:00
|
|
|
state: state.clone(),
|
2019-11-07 09:59:02 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// A future representing state of accepting a TLS connection.
|
|
|
|
pub struct AcceptTls {
|
2019-11-14 12:10:25 -05:00
|
|
|
accept_state: AcceptTlsState,
|
2019-11-07 09:59:02 -05:00
|
|
|
rid: ResourceId,
|
2020-02-08 14:34:31 -05:00
|
|
|
state: State,
|
2019-11-07 09:59:02 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Future for AcceptTls {
|
2019-11-16 19:17:47 -05:00
|
|
|
type Output = Result<(TcpStream, SocketAddr), ErrBox>;
|
2019-11-07 09:59:02 -05:00
|
|
|
|
2019-11-16 19:17:47 -05:00
|
|
|
fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
|
|
|
|
let inner = self.get_mut();
|
|
|
|
if inner.accept_state == AcceptTlsState::Done {
|
2019-11-07 09:59:02 -05:00
|
|
|
panic!("poll AcceptTls after it's done");
|
|
|
|
}
|
|
|
|
|
2020-02-08 14:34:31 -05:00
|
|
|
let mut state = inner.state.borrow_mut();
|
|
|
|
let listener_resource = state
|
|
|
|
.resource_table
|
2019-11-16 19:17:47 -05:00
|
|
|
.get_mut::<TlsListenerResource>(inner.rid)
|
2019-11-07 09:59:02 -05:00
|
|
|
.ok_or_else(|| {
|
|
|
|
let e = std::io::Error::new(
|
|
|
|
std::io::ErrorKind::Other,
|
|
|
|
"Listener has been closed",
|
|
|
|
);
|
|
|
|
ErrBox::from(e)
|
|
|
|
})?;
|
|
|
|
|
2019-12-30 08:57:17 -05:00
|
|
|
let listener = &mut listener_resource.listener;
|
2019-11-07 09:59:02 -05:00
|
|
|
|
2019-12-30 08:57:17 -05:00
|
|
|
match listener.poll_accept(cx).map_err(ErrBox::from) {
|
|
|
|
Poll::Ready(Ok((stream, addr))) => {
|
2019-11-07 09:59:02 -05:00
|
|
|
listener_resource.untrack_task();
|
2019-11-16 19:17:47 -05:00
|
|
|
inner.accept_state = AcceptTlsState::Done;
|
|
|
|
Poll::Ready(Ok((stream, addr)))
|
2019-11-07 09:59:02 -05:00
|
|
|
}
|
2019-11-16 19:17:47 -05:00
|
|
|
Poll::Pending => {
|
|
|
|
listener_resource.track_task(cx)?;
|
|
|
|
Poll::Pending
|
2019-11-07 09:59:02 -05:00
|
|
|
}
|
2019-12-30 08:57:17 -05:00
|
|
|
Poll::Ready(Err(e)) => {
|
2019-11-07 09:59:02 -05:00
|
|
|
listener_resource.untrack_task();
|
2019-11-16 19:17:47 -05:00
|
|
|
inner.accept_state = AcceptTlsState::Done;
|
|
|
|
Poll::Ready(Err(e))
|
2019-11-07 09:59:02 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-21 14:38:28 -04:00
|
|
|
#[derive(Deserialize)]
|
|
|
|
struct AcceptTlsArgs {
|
|
|
|
rid: i32,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn op_accept_tls(
|
2020-02-08 14:34:31 -05:00
|
|
|
state: &State,
|
2019-10-21 14:38:28 -04:00
|
|
|
args: Value,
|
2020-01-24 15:10:49 -05:00
|
|
|
_zero_copy: Option<ZeroCopyBuf>,
|
2019-10-21 14:38:28 -04:00
|
|
|
) -> Result<JsonOp, ErrBox> {
|
|
|
|
let args: AcceptTlsArgs = serde_json::from_value(args)?;
|
2019-11-07 09:59:02 -05:00
|
|
|
let rid = args.rid as u32;
|
2019-12-30 08:57:17 -05:00
|
|
|
let state = state.clone();
|
|
|
|
let op = async move {
|
|
|
|
let (tcp_stream, _socket_addr) = accept_tls(&state.clone(), rid).await?;
|
|
|
|
let local_addr = tcp_stream.local_addr()?;
|
|
|
|
let remote_addr = tcp_stream.peer_addr()?;
|
|
|
|
let tls_acceptor = {
|
2020-02-08 14:34:31 -05:00
|
|
|
let state = state.borrow();
|
|
|
|
let resource = state
|
|
|
|
.resource_table
|
2019-11-07 09:59:02 -05:00
|
|
|
.get::<TlsListenerResource>(rid)
|
|
|
|
.ok_or_else(bad_resource)
|
|
|
|
.expect("Can't find tls listener");
|
2019-12-30 08:57:17 -05:00
|
|
|
resource.tls_acceptor.clone()
|
|
|
|
};
|
|
|
|
let tls_stream = tls_acceptor.accept(tcp_stream).await?;
|
|
|
|
let rid = {
|
2020-02-08 14:34:31 -05:00
|
|
|
let mut state = state.borrow_mut();
|
|
|
|
state.resource_table.add(
|
2019-12-30 08:57:17 -05:00
|
|
|
"serverTlsStream",
|
|
|
|
Box::new(StreamResource::ServerTlsStream(Box::new(tls_stream))),
|
2019-11-16 19:17:47 -05:00
|
|
|
)
|
2019-12-30 08:57:17 -05:00
|
|
|
};
|
|
|
|
Ok(json!({
|
|
|
|
"rid": rid,
|
2020-01-18 15:49:55 -05:00
|
|
|
"localAddr": {
|
|
|
|
"transport": "tcp",
|
|
|
|
"hostname": local_addr.ip().to_string(),
|
|
|
|
"port": local_addr.port()
|
|
|
|
},
|
|
|
|
"remoteAddr": {
|
|
|
|
"transport": "tcp",
|
|
|
|
"hostname": remote_addr.ip().to_string(),
|
|
|
|
"port": remote_addr.port()
|
|
|
|
}
|
2019-12-30 08:57:17 -05:00
|
|
|
}))
|
|
|
|
};
|
2019-10-21 14:38:28 -04:00
|
|
|
|
2020-02-03 18:08:44 -05:00
|
|
|
Ok(JsonOp::Async(op.boxed_local()))
|
2019-10-21 14:38:28 -04:00
|
|
|
}
|