diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2019-05-17 20:50:53 +0200 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2019-05-17 14:50:53 -0400 |
commit | 7219787894f13b1920b3b6b49203cdcb8f672c00 (patch) | |
tree | 8940cd6e5f9394e7d7db1d27fcea839050c6c23b /cli/ops.rs | |
parent | 00f6fa46b34b78e926a907ee24faec78a65eafc1 (diff) |
Fix permissions for dial and listen (#2373)
Diffstat (limited to 'cli/ops.rs')
-rw-r--r-- | cli/ops.rs | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/cli/ops.rs b/cli/ops.rs index 9b5bc0079..2960f3d9d 100644 --- a/cli/ops.rs +++ b/cli/ops.rs @@ -1625,19 +1625,18 @@ fn op_listen( data: Option<PinnedBuf>, ) -> Box<OpWithError> { assert!(data.is_none()); - if let Err(e) = state.check_net("listen") { - return odd_future(e); - } - let cmd_id = base.cmd_id(); let inner = base.inner_as_listen().unwrap(); let network = inner.network().unwrap(); assert_eq!(network, "tcp"); let address = inner.address().unwrap(); + if let Err(e) = state.check_net(&address) { + return odd_future(e); + } + Box::new(futures::future::result((move || { let addr = resolve_addr(address).wait()?; - let listener = TcpListener::bind(&addr)?; let resource = resources::add_tcp_listener(listener); @@ -1682,14 +1681,11 @@ fn new_conn(cmd_id: u32, tcp_stream: TcpStream) -> OpResult { } fn op_accept( - state: &ThreadSafeState, + _state: &ThreadSafeState, base: &msg::Base<'_>, data: Option<PinnedBuf>, ) -> Box<OpWithError> { assert!(data.is_none()); - if let Err(e) = state.check_net("accept") { - return odd_future(e); - } let cmd_id = base.cmd_id(); let inner = base.inner_as_accept().unwrap(); let server_rid = inner.rid(); @@ -1713,15 +1709,16 @@ fn op_dial( data: Option<PinnedBuf>, ) -> Box<OpWithError> { assert!(data.is_none()); - if let Err(e) = state.check_net("dial") { - return odd_future(e); - } let cmd_id = base.cmd_id(); let inner = base.inner_as_dial().unwrap(); let network = inner.network().unwrap(); assert_eq!(network, "tcp"); // TODO Support others. let address = inner.address().unwrap(); + if let Err(e) = state.check_net(&address) { + return odd_future(e); + } + let op = resolve_addr(address) .map_err(DenoError::from) |