bind-shell 0.1.2rc2__tar.gz → 0.1.3rc2__tar.gz

{bind_shell-0.1.2rc2 → bind_shell-0.1.3rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bind-shell
-Version: 0.1.2rc2
+Version: 0.1.3rc2
 Summary: A Typer CLI for creating and connecting to bind shells and reverse shells. Built on Python's stdlib socket — no external dependencies.
 License: MIT
 Author: Tyson Holub

{bind_shell-0.1.2rc2 → bind_shell-0.1.3rc2}/pyproject.toml

@@ -26,7 +26,7 @@ pythonpath = ["pysrc"]
 
 [tool.poetry]
 name = "bind-shell"
-version = "0.1.2rc2"
+version = "0.1.3rc2"
 description = "A Typer CLI for creating and connecting to bind shells and reverse shells. Built on Python's stdlib socket — no external dependencies."
 authors = ["Tyson Holub <tyson@tysonholub.com>"]
 license = "MIT"
@@ -56,7 +56,7 @@ include_trailing_comma = true
 src_paths = ["pysrc", "pytests"]
 
 [tool.bandit]
-skips = ["B603", "B602"]
+skips = ["B104", "B604", "B603", "B602"]
 
 [tool.coverage.report]
 # Regexes for lines to exclude from consideration

{bind_shell-0.1.2rc2 → bind_shell-0.1.3rc2}/pysrc/bind_shell/app.py

@@ -47,13 +47,16 @@ def _generate_password() -> str:
 
 @cli.command(name="server", help="Bind shell: bind a port and execute commands from an incoming client")
 def server(
-    host: Annotated[str, typer.Option("--host", help="Host address to bind to")] = "0.0.0.0",  # nosec: B104
+    host: Annotated[str, typer.Option("--host", help="Host address to bind to")] = "0.0.0.0",
     port: Annotated[int, typer.Option("--port", help="Port to listen on")] = DEFAULT_PORT,
+    shell: Annotated[
+        str | None, typer.Option("--shell", help="Shell executable to use (e.g. /bin/bash, pwsh)")
+    ] = None,
 ):
     ip = get_ip()
     password = _generate_password()
     logger.info(f"Bind-Shell Connection: bind-shell client {ip} --port {port} --password {password}")
-    run_server(host=host, port=port, password=password)
+    run_server(host=host, port=port, password=password, shell=shell)
 
 
 @cli.command(name="client", help="Bind shell: connect to a server and send commands interactively")
@@ -67,7 +70,7 @@ def client(
 
 @cli.command(name="listen", help="Reverse shell: bind a port and send commands to an incoming connector")
 def listen(
-    host: Annotated[str, typer.Option("--host", help="Host address to bind to")] = "0.0.0.0",  # nosec: B104
+    host: Annotated[str, typer.Option("--host", help="Host address to bind to")] = "0.0.0.0",
     port: Annotated[int, typer.Option("--port", help="Port to listen on")] = DEFAULT_PORT,
 ):
     ip = get_ip()
@@ -81,5 +84,8 @@ def connect(
     host: Annotated[str, typer.Argument(help="Host address of the reverse shell listener")],
     port: Annotated[int, typer.Option("--port", help="Port to connect to")] = DEFAULT_PORT,
     password: Annotated[str, typer.Option("--password", help="Password for authentication")] = ...,
+    shell: Annotated[
+        str | None, typer.Option("--shell", help="Shell executable to use (e.g. /bin/bash, pwsh)")
+    ] = None,
 ):
-    run_connect(host=host, port=port, password=password)
+    run_connect(host=host, port=port, password=password, shell=shell)

{bind_shell-0.1.2rc2 → bind_shell-0.1.3rc2}/pysrc/bind_shell/commands.py

@@ -32,7 +32,7 @@ def _auth_client(sock: socket.socket, password: str) -> bool:
     return response.strip() == b"authenticated"
 
 
-def _executor_loop(conn: socket.socket, prompt: bytes = PROMPT):
+def _executor_loop(conn: socket.socket, prompt: bytes = PROMPT, shell: str | None = None):
     while True:
         conn.sendall(prompt)
         try:
@@ -46,7 +46,10 @@ def _executor_loop(conn: socket.socket, prompt: bytes = PROMPT):
             break
         logger.info(f"$ {cmd}")
         try:
-            result = subprocess.run(cmd, shell=True, capture_output=True, timeout=CMD_TIMEOUT)  # nosec
+            if shell:
+                result = subprocess.run([shell, "-c", cmd], capture_output=True, timeout=CMD_TIMEOUT)  # nosec
+            else:
+                result = subprocess.run(cmd, shell=True, capture_output=True, timeout=CMD_TIMEOUT)  # nosec
             output = result.stdout + result.stderr
         except subprocess.TimeoutExpired:
             output = b"Command timed out\n"
@@ -76,13 +79,13 @@ def _interactive_loop(sock: socket.socket):
         pass
 
 
-def _executor_session(conn: socket.socket, addr: tuple, password: str):
+def _executor_session(conn: socket.socket, addr: tuple, password: str, shell: str | None = None):
     logger.info(f"Client connected: {addr[0]}:{addr[1]}")
     if not _auth_server(conn, password):
         logger.info(f"Authentication failed: {addr[0]}:{addr[1]}")
         return
     try:
-        _executor_loop(conn, prompt=f"bind-shell@{conn.getsockname()[0]}$ ".encode())
+        _executor_loop(conn, prompt=f"bind-shell@{conn.getsockname()[0]}$ ".encode(), shell=shell)
     finally:
         logger.info(f"Client disconnected: {addr[0]}:{addr[1]}")
 
@@ -101,7 +104,7 @@ def _interactive_session(conn: socket.socket, addr: tuple, password: str):
         sys.stdout.buffer.flush()
 
 
-def run_server(host: str, port: int, password: str):
+def run_server(host: str, port: int, password: str, shell: str | None = None):
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as server:
         server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         server.bind((host, port))
@@ -109,7 +112,7 @@ def run_server(host: str, port: int, password: str):
         try:
             while True:
                 conn, addr = server.accept()
-                threading.Thread(target=_executor_session, args=(conn, addr, password), daemon=True).start()
+                threading.Thread(target=_executor_session, args=(conn, addr, password, shell), daemon=True).start()
         except KeyboardInterrupt:
             pass
 
@@ -136,10 +139,10 @@ def run_listen(host: str, port: int, password: str):
             pass
 
 
-def run_connect(host: str, port: int, password: str):
+def run_connect(host: str, port: int, password: str, shell: str | None = None):
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
         sock.connect((host, port))
         local_ip, local_port = sock.getsockname()
         if not _auth_client(sock, password):
             raise Exception("Authentication failed")
-        _executor_loop(sock, prompt=f"bind-shell@{local_ip}:{local_port}$ ".encode())
+        _executor_loop(sock, prompt=f"bind-shell@{local_ip}:{local_port}$ ".encode(), shell=shell)