Fix bug on trojan domain name dump that misses the length data; Fix bug on socks protocol read domain name utility.

Author: cty123

src/protocol/common/addr.rs

@@ -43,7 +43,16 @@ impl Into<std::io::Result<SocketAddr>> for IpAddrPort {
         match self.ip {
             IpAddress::IpAddr(addr) => Ok(SocketAddr::new(addr, self.port)),
             IpAddress::Domain(domain) => {
-                let name = std::str::from_utf8(&domain.inner).unwrap_or("127.0.0.1");
+                let name = match std::str::from_utf8(&domain.inner) {
+                    Ok(name) => name,
+                    Err(_) => {
+                        return Err(Error::new(
+                            ErrorKind::InvalidData,
+                            "request domain name contains non-utf8 character",
+                        ))
+                    }
+                };
+
                 // to_socket_addrs function implicitly runs a DNS query to resolve the DomainName
                 let addrs = match (name, self.port).to_socket_addrs() {
                     Ok(a) => a,

src/protocol/socks5/parser.rs

@@ -42,7 +42,7 @@ pub async fn parse<T: AsyncRead + AsyncWrite + Unpin>(mut stream: T) -> Result<R
         Atype::DomainName => {
             // Read address size
             let size = stream.read_u8().await? as usize;
-            let mut buf = Vec::with_capacity(size);
+            let mut buf = vec![0u8; size];
 
             // Read address data
             stream.read_exact(&mut buf).await?;

src/protocol/trojan/mod.rs

@@ -52,6 +52,7 @@ pub async fn handshake<T: AsyncWrite + Unpin>(
             stream.write_all(&ipv6.octets()).await?;
         }
         IpAddress::Domain(domain) => {
+            stream.write_u8(domain.as_bytes().len() as u8).await?;
             stream.write_all(&domain.as_bytes()).await?;
         }
     }