fix: Make TLS work for testing

Author: kkrypt0nn

Cargo.lock

@@ -66,8 +66,6 @@ async-native-tls = { version = "0.5.0", default-features = false, features = [
 async-imap = { version = "0.9.1", default-features = false, features = [
     "runtime-tokio",
 ], optional = true }
-irc = { version = "1.0.0", optional = true }
-futures = { version = "0.3.0", optional = true }
 mini-telnet = { version = "0.1.8", optional = true }
 ldap3 = { version = "0.11.3", optional = true }
 kerberos_crypto = { version = "0.3.6", optional = true }
@@ -138,7 +136,7 @@ ftp = ["dep:async_ftp"]
 smtp = ["dep:async-smtp"]
 pop3 = ["dep:async-pop"]
 imap = ["dep:async-imap"]
-irc = ["dep:irc", "dep:futures"]
+irc = []
 telnet = ["dep:mini-telnet"]
 ldap = ["dep:ldap3"]
 kerberos = [

Cargo.toml

@@ -1,6 +1,6 @@
-use futures::StreamExt;
-
+use rand::Rng;
 use std::time::Duration;
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
 
 use async_trait::async_trait;
 
@@ -26,6 +26,20 @@ impl IRC {
     pub fn new() -> Self {
         IRC { tls: false }
     }
+
+    fn generate_random_username() -> String {
+        let mut rng = rand::thread_rng();
+        let length = rng.gen_range(5..=9);
+        (0..length)
+            .map(|_| {
+                if rng.gen_bool(0.5) {
+                    rng.gen_range(b'a'..=b'z') as char
+                } else {
+                    rng.gen_range(b'A'..=b'Z') as char
+                }
+            })
+            .collect()
+    }
 }
 
 #[async_trait]
@@ -44,43 +58,39 @@ impl Plugin for IRC {
         creds: &Credentials,
         timeout: Duration,
     ) -> Result<Option<Vec<Loot>>, Error> {
-        let (address, port) =
-            utils::parse_target(&creds.target, if self.tls { 6697 } else { 6667 })?;
+        let address =
+            utils::parse_target_address(&creds.target, if self.tls { 6697 } else { 6667 })?;
 
-        let mut config = irc::client::data::Config::default();
-        config.nickname = Some(creds.username.to_owned());
-        // Prevents erroring when getting a ERR_NICKNAMEINUSE response from the server because of concurrency
-        config.alt_nicks = vec![
-            "legba1".to_owned(),
-            "legba2".to_owned(),
-            "legba3".to_owned(),
-        ];
-        config.server = Some(address.to_owned());
-        config.port = Some(port);
-        config.password = Some(creds.password.to_owned());
-        config.use_tls = Some(self.tls);
+        let mut stream = crate::utils::net::async_tcp_stream(&address, timeout, self.tls).await?;
 
-        let mut client = tokio::time::timeout(timeout, irc::client::Client::from_config(config))
+        let username = IRC::generate_random_username();
+        stream
+            .write_all(
+                format!(
+                    "NICK {}\r\nUSER {} 0 * :{}\r\nPASS {}\r\n",
+                    username, username, username, creds.password
+                )
+                .as_bytes(),
+            )
             .await
-            .map_err(|e| e.to_string())?
             .map_err(|e| e.to_string())?;
-        if client.identify().is_ok() {
-            let mut stream = client.stream().map_err(|e| e.to_string())?;
-            while let Some(message) = stream.next().await.transpose().map_err(|e| e.to_string())? {
-                if matches!(
-                    message.command,
-                    irc::proto::Command::Response(irc::proto::Response::RPL_WELCOME, ..)
-                ) {
-                    return Ok(Some(vec![Loot::new(
-                        "irc",
-                        &address,
-                        [("password".to_owned(), creds.password.to_owned())],
-                    )]));
-                }
+
+        let mut buffer = vec![0; 1024];
+        let mut accumulated_data = Vec::new();
+        loop {
+            let bytes_read = stream.read(&mut buffer).await.map_err(|e| e.to_string())?;
+            if bytes_read == 0 {
+                return Ok(None);
+            }
+            accumulated_data.extend_from_slice(&buffer[..bytes_read]);
+            let response = String::from_utf8_lossy(&accumulated_data);
+            if response.contains(" 001 ") && response.contains("Welcome") {
+                return Ok(Some(vec![Loot::new(
+                    "irc",
+                    &address,
+                    [("password".to_owned(), creds.password.to_owned())],
+                )]));
             }
-            Ok(None)
-        } else {
-            Ok(None)
         }
     }
 }

src/plugins/irc/mod.rs

@@ -0,0 +1,12 @@
+<connect allow="*" password="test12345">
+
+<bind address="*" port="6667" type="clients">
+<bind address="*" port="6697" type="clients" ssl="ssl">
+
+<module name="ssl_gnutls">
+<sslprofile name="ssl"
+       provider="gnutls"
+       certfile="/inspircd/conf/cert.pem"
+       keyfile="/inspircd/conf/key.pem"
+       dhfile="/inspircd/conf/dhparams.pem"
+       priority="NORMAL:-MD5">

test-servers/inspircd.config/inspircd.conf

@@ -1,3 +1,4 @@
 docker run -p 6667:6667 \
-    -e "INSP_CONNECT_PASSWORD=test12345" \
+    -p 6697:6697 \
+    -v ./inspircd.config:/inspircd/conf/ \
     inspircd/inspircd-docker