Merge pull request #193 from nervosnetwork/bump-to-0.2.6

chore: bump to 0.2.6

Author: driftluo

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.2.6
+
+### Features
+
+- Secio removed support for `twofish-ctr`, [detail](https://github.com/nervosnetwork/p2p/pull/191)
+- Secio added support for `aes-gcm/chacha20poly1305`, [detail](https://github.com/nervosnetwork/p2p/pull/191)
+- Secio default symmetric encryption algorithm change to `aes-128-gcm`, [detail](https://github.com/nervosnetwork/p2p/pull/191)
+- Use industry standard encryption algorithms in openssl or ring, [detail](https://github.com/nervosnetwork/p2p/pull/191)
+- Upgrade molecule
+- Secio bump to 0.2.0
+- Change panic report road
+
+### Bug fix
+
+- Fix the implementation of non-standard encryption algorithms
+- Fix potential overflow
+- Fix handshake attack
+
 ## 0.2.5
 
 ### Features

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tentacle"
-version = "0.2.5"
+version = "0.2.6"
 license = "MIT"
 description = "Minimal implementation for a multiplexed p2p network framework."
 authors = ["piaoliu <[email protected]>", "Nervos Core Dev <[email protected]>"]
@@ -17,7 +17,7 @@ all-features = false
 no-default-features = true
 
 [dependencies]
-yamux = { path = "yamux", version = "0.1.13", package = "tokio-yamux" }
+yamux = { path = "yamux", version = "0.1.14", package = "tokio-yamux" }
 secio = { path = "secio", version = "0.2.0", package = "tentacle-secio" }
 
 futures = "0.1"

README.md

@@ -38,7 +38,7 @@ The API of this project is basically usable. However we still need more tests. P
 
 ```toml
 [dependencies]
-tentacle = { version = "0.2", feaures = ["molc"] }
+tentacle = { version = "0.2", features = ["molc"] }
 ```
 
 ### Example
@@ -53,13 +53,13 @@ $ git clone https://github.com/nervosnetwork/p2p.git
 
 Listen on 127.0.0.1:1337
 ```bash
-$ RUST_LOG=simple=info,tentacle=debug cargo run --example simple --feaures molc -- server
+$ RUST_LOG=simple=info,tentacle=debug cargo run --example simple --features molc -- server
 ```
 
 3. On another terminal:
 
 ```bash
-$ RUST_LOG=simple=info,tentacle=debug cargo run --example simple --feaures molc
+$ RUST_LOG=simple=info,tentacle=debug cargo run --example simple --features molc
 ```
 
 4. Now you can see some data interaction information on the terminal.

protocols/discovery/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tentacle-discovery"
-version = "0.2.7"
+version = "0.2.8"
 authors = ["Linfeng Qian <[email protected]>"]
 license = "MIT"
 description = "p2p discovery protocol main reference bitcoin"
@@ -15,7 +15,7 @@ all-features = false
 no-default-features = true
 
 [dependencies]
-p2p = { path = "../..", version = "0.2.5", package = "tentacle" }
+p2p = { path = "../..", version = "0.2.6", package = "tentacle" }
 bytes = "0.4"
 byteorder = "1.2"
 futures = "0.1"

protocols/identify/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tentacle-identify"
-version = "0.2.8"
+version = "0.2.9"
 authors = ["Qian Linfeng <[email protected]>"]
 license = "MIT"
 description = "p2p identify protocol"
@@ -15,7 +15,7 @@ all-features = false
 no-default-features = true
 
 [dependencies]
-p2p = { path = "../..", version = "0.2.5", package = "tentacle" }
+p2p = { path = "../..", version = "0.2.6", package = "tentacle" }
 bytes = "0.4"
 flatbuffers = { version = "0.6.0", optional = true }
 flatbuffers-verifier = { version = "0.2.0", optional = true }

protocols/ping/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tentacle-ping"
-version = "0.3.7"
+version = "0.3.8"
 authors = ["Nervos Core Dev <[email protected]>"]
 license = "MIT"
 keywords = ["network", "peer-to-peer", "p2p", "ping"]
@@ -15,7 +15,7 @@ all-features = false
 no-default-features = true
 
 [dependencies]
-p2p = { path = "../..", version = "0.2.5", package = "tentacle" }
+p2p = { path = "../..", version = "0.2.6", package = "tentacle" }
 log = "0.4"
 flatbuffers = { version = "0.6.0", optional = true }
 flatbuffers-verifier = { version = "0.2.0", optional = true }

src/session.rs

@@ -331,8 +331,14 @@ where
 
     /// After the session is established, the client is requested to open some custom protocol sub stream.
     pub fn open_proto_stream(&mut self, proto_name: &str) {
+        let handle = match self.socket.open_stream() {
+            Ok(handle) => handle,
+            Err(e) => {
+                debug!("session {} open stream error: {}", self.context.id, e);
+                return;
+            }
+        };
         debug!("try open proto, {}", proto_name);
-        let handle = self.socket.open_stream().unwrap();
         let versions = self.protocol_configs[proto_name].support_versions.clone();
         let proto_info = ProtocolInfo::new(&proto_name, versions);
 

yamux/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tokio-yamux"
-version = "0.1.13"
+version = "0.1.14"
 license = "MIT"
 repository = "https://github.com/nervosnetwork/p2p"
 description = "Rust implementation of Yamux"

yamux/src/stream.rs

@@ -402,12 +402,12 @@ impl io::Write for StreamHandle {
             match e {
                 Error::SessionShutdown => return Err(io::ErrorKind::BrokenPipe.into()),
                 // read flag error or read data error
-                Error::UnexpectedFlag | Error::RecvWindowExceeded => {
+                Error::UnexpectedFlag | Error::RecvWindowExceeded | Error::InvalidMsgType => {
                     return Err(io::ErrorKind::InvalidData.into());
                 }
                 Error::SubStreamRemoteClosing => (),
                 Error::WouldBlock => return Err(io::ErrorKind::WouldBlock.into()),
-                _ => unimplemented!(),
+                _ => (),
             }
         }
         if self.state == StreamState::LocalClosing || self.state == StreamState::Closed {
@@ -450,12 +450,12 @@ impl io::Write for StreamHandle {
             match e {
                 Error::SessionShutdown => return Err(io::ErrorKind::BrokenPipe.into()),
                 // read flag error or read data error
-                Error::UnexpectedFlag | Error::RecvWindowExceeded => {
+                Error::UnexpectedFlag | Error::RecvWindowExceeded | Error::InvalidMsgType => {
                     return Err(io::ErrorKind::InvalidData.into());
                 }
                 Error::SubStreamRemoteClosing => (),
                 Error::WouldBlock => return Err(io::ErrorKind::WouldBlock.into()),
-                _ => unimplemented!(),
+                _ => (),
             }
         }
         let event = StreamEvent::Flush(self.id);