security audit fix

Author: dudochkin-victor

Cargo.toml

@@ -22,18 +22,20 @@ serde_json = "1.0"
 url = "2.2"
 log = "0.4"
 env_logger = "0.9"
-ws = "0.9"
+# ws = "0.9"
 rmp = "0.8"
 rmp-serde = "1.1"
 rand = "0.8"
 futures = "0.3"
 itertools = "0.10"
 argparse = "0.2.1"
 intmap = "0.7.1"
+parity-ws = "0.11"
 
 [dev-dependencies]
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] }
 
 [features]
 default = []
-ssl = ["ws/ssl"]
+# ssl = ["ws/ssl"]
+ssl = ["parity-ws/ssl"]

src/client.rs

@@ -93,7 +93,7 @@ use log::{debug, error, info, trace, warn};
 use rmp_serde::{Deserializer as RMPDeserializer, Serializer};
 use serde::{Deserialize, Serialize};
 use url::Url;
-use ws::{
+use parity_ws::{
     connect, util::Token, CloseCode, Error as WSError, ErrorKind as WSErrorKind, Handler,
     Handshake, Message as WSMessage, Request, Result as WSResult, Sender,
 };

src/error.rs

@@ -3,7 +3,7 @@ use std::{fmt, sync::mpsc::SendError};
 use rmp_serde::decode::Error as MsgPackError;
 use serde_json::Error as JSONError;
 use url::ParseError;
-use ws::Error as WSError;
+use parity_ws::Error as WSError;
 
 use crate::messages::{self, Reason};
 

src/router/handshake.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use log::{debug, info, warn};
-use ws::{
+use parity_ws::{
     CloseCode, Error as WSError, ErrorKind as WSErrorKind, Request, Response, Result as WSResult,
 };
 

src/router/messaging.rs

@@ -8,7 +8,7 @@ use log::{debug, error, info, trace};
 use rmp_serde::{Deserializer as RMPDeserializer, Serializer};
 use serde::{Deserialize, Serialize};
 
-use ws::{
+use parity_ws::{
     CloseCode, Error as WSError, ErrorKind as WSErrorKind, Handler, Message as WSMessage, Request,
     Response, Result as WSResult, Sender,
 };

src/router/mod.rs

@@ -177,7 +177,7 @@ use std::{
 
 use log::{debug, info, trace};
 use rand::{thread_rng, Rng};
-use ws::{listen as ws_listen, Result as WSResult, Sender};
+use parity_ws::{listen as ws_listen, Result as WSResult, Sender};
 
 use crate::messages::{ErrorDetails, Message, Reason};