simple-proxy 0.0.28__tar.gz → 0.0.30__tar.gz

{simple_proxy-0.0.28/simple_proxy.egg-info → simple_proxy-0.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_proxy
-Version: 0.0.28
+Version: 0.0.30
 Summary: A simple NIO proxy tool
 Home-page: https://github.com/ruanhao/simple-proxy
 Author-email: Hao Ruan <ruanhao1116@gmail.com>
@@ -26,7 +26,7 @@ Requires-Python: <4,>=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click-option-group
-Requires-Dist: py-netty>=1.0.5
+Requires-Dist: py-netty>=1.0.8
 Requires-Dist: cryptography>=42.0.0
 Requires-Dist: attrs>=22.1.0
 Provides-Extra: dev
@@ -43,6 +43,7 @@ Dynamic: license-file
 
 [![CI](https://github.com/ruanhao/simple-proxy/actions/workflows/ci.yml/badge.svg)](https://github.com/ruanhao/simple-proxy/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/github/ruanhao/simple-proxy/graph/badge.svg?token=812EM2WL0L)](https://codecov.io/github/ruanhao/simple-proxy)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/simple-proxy)
 
 
 
@@ -69,69 +70,53 @@ pip install simple-proxy -U
 Usage: simple-proxy [OPTIONS]
 
 Options:
-  Common configuration:           Configuration for local/remote
-                                  endpoints
-    -l, --listening-host TEXT     Listening server address
-                                  [default: localhost]
+  Common configuration:           Configuration for local/remote endpoints
+    -l, --listening-host TEXT     Listening server address  [default: localhost]
     -lp, --listening-port INTEGER
                                   Listening port  [default: 8080]
     -g, --global                  Listening on all interfaces
     -r, --remote-host TEXT        Remote host  [default: localhost]
     -rp, --remote-port INTEGER    Remote port  [default: 80]
-    -s, --tls                     Denote remote is listening on
-                                  secure port
+    -s, --tls                     Denote remote is listening on secure port
     -ss                           Listening on secure port
   TCP proxy configuration:        Configuration for TCP proxy mode
     --read-delay-millis INTEGER   Read delay(ms)  [default: 0]
     --write-delay-millis INTEGER  Write delay(ms)  [default: 0]
+    -sni, --server-name-indication TEXT
+                                  Server Name Indication(SNI) for TLS connection to remote server
   Thread configuration:           Configuration for thread
-    --workers INTEGER             Number of worker threads
-                                  [default: 1]
-    --proxy-workers INTEGER       Number of proxy threads  [default:
-                                  1]
+    --workers INTEGER             Number of worker threads  [default: 1]
+    --proxy-workers INTEGER       Number of proxy threads  [default: 1]
   Traffic dump configuration:     Configuration for traffic dump
     -c, --tcp-flow                Dump tcp flow on to console
     -f, --save-tcp-flow           Save tcp flow to file
-  TLS certificate configuration: 
+  TLS certificate configuration:
                                   Configuration for TLS certificate
     -kf, --key-file PATH          Key file for local server
     -cf, --cert-file PATH         Certificate file for local server
-    --alpn                        Set ALPN protocol as [h2,
-                                  http/1.1]
-  Traffic monitor configuration: 
+    --alpn                        Set ALPN protocol as [h2, http/1.1]
+  Traffic monitor configuration:
                                   Configuration for traffic monitor
-    -m, --monitor                 Print speed info to console for
-                                  established connection
+    -m, --monitor                 Print speed info to console for established connection
     -mi, --monitor-interval INTEGER
-                                  Speed monitor interval(seconds)
-                                  [default: 3]
-  TLS Disguise configuration:     Configuration for protection
-                                  against unwanted inspection
+                                  Speed monitor interval(seconds)  [default: 3]
+  TLS Disguise configuration:     Configuration for protection against unwanted inspection
     -dti, --disguise-tls-ip TEXT  Disguised upstream TLS IP
     -dtp, --disguise-tls-port INTEGER
-                                  Disguised upstream TLS port
-                                  [default: 443]
-    --run-disguise-tls-server     Run builtin disguise TLS server
-                                  without specifying external one
-    -wl, --white-list TEXT        IP White list for legal incoming
-                                  TLS connections (comma separated)
-  Proxy configuration:            Configuration for application
-                                  proxies
+                                  Disguised upstream TLS port  [default: 443]
+    --run-disguise-tls-server     Run builtin disguise TLS server without specifying external one
+    -wl, --white-list TEXT        IP White list for legal incoming TLS connections (comma separated)
+  Proxy configuration:            Configuration for application proxies
     -e, --echo-proxy              Run as Echo server
     --shell-proxy                 Run as shell proxy server
     --http-proxy                  Run as HTTP proxy server
     --socks5-proxy                Run as SOCKS5 proxy server
-    --proxy-username TEXT         Proxy username for HTTP/SOCKS5
-                                  proxy
-    --proxy-password TEXT         Proxy password for HTTP/SOCKS5
-                                  proxy
+    --proxy-username TEXT         Proxy username for HTTP/SOCKS5 proxy
+    --proxy-password TEXT         Proxy password for HTTP/SOCKS5 proxy
     -t, --proxy-transform <TEXT INTEGER TEXT INTEGER>...
-                                  List of target
-                                  transformations(origin_host,
-                                  origin_port, transformed_host,
-                                  transformed_port) for HTTP/SOCKS5
-                                  proxy
-  Misc configuration: 
+                                  List of target transformations(origin_host, origin_port, transformed_host,
+                                  transformed_port) for HTTP/SOCKS5 proxy
+  Misc configuration:
     -v, --verbose
     --log-file PATH               Log file
   --version                       Show the version and exit.

{simple_proxy-0.0.28 → simple_proxy-0.0.30}/README.md

@@ -2,6 +2,7 @@
 
 [![CI](https://github.com/ruanhao/simple-proxy/actions/workflows/ci.yml/badge.svg)](https://github.com/ruanhao/simple-proxy/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/github/ruanhao/simple-proxy/graph/badge.svg?token=812EM2WL0L)](https://codecov.io/github/ruanhao/simple-proxy)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/simple-proxy)
 
 
 
@@ -28,69 +29,53 @@ pip install simple-proxy -U
 Usage: simple-proxy [OPTIONS]
 
 Options:
-  Common configuration:           Configuration for local/remote
-                                  endpoints
-    -l, --listening-host TEXT     Listening server address
-                                  [default: localhost]
+  Common configuration:           Configuration for local/remote endpoints
+    -l, --listening-host TEXT     Listening server address  [default: localhost]
     -lp, --listening-port INTEGER
                                   Listening port  [default: 8080]
     -g, --global                  Listening on all interfaces
     -r, --remote-host TEXT        Remote host  [default: localhost]
     -rp, --remote-port INTEGER    Remote port  [default: 80]
-    -s, --tls                     Denote remote is listening on
-                                  secure port
+    -s, --tls                     Denote remote is listening on secure port
     -ss                           Listening on secure port
   TCP proxy configuration:        Configuration for TCP proxy mode
     --read-delay-millis INTEGER   Read delay(ms)  [default: 0]
     --write-delay-millis INTEGER  Write delay(ms)  [default: 0]
+    -sni, --server-name-indication TEXT
+                                  Server Name Indication(SNI) for TLS connection to remote server
   Thread configuration:           Configuration for thread
-    --workers INTEGER             Number of worker threads
-                                  [default: 1]
-    --proxy-workers INTEGER       Number of proxy threads  [default:
-                                  1]
+    --workers INTEGER             Number of worker threads  [default: 1]
+    --proxy-workers INTEGER       Number of proxy threads  [default: 1]
   Traffic dump configuration:     Configuration for traffic dump
     -c, --tcp-flow                Dump tcp flow on to console
     -f, --save-tcp-flow           Save tcp flow to file
-  TLS certificate configuration: 
+  TLS certificate configuration:
                                   Configuration for TLS certificate
     -kf, --key-file PATH          Key file for local server
     -cf, --cert-file PATH         Certificate file for local server
-    --alpn                        Set ALPN protocol as [h2,
-                                  http/1.1]
-  Traffic monitor configuration: 
+    --alpn                        Set ALPN protocol as [h2, http/1.1]
+  Traffic monitor configuration:
                                   Configuration for traffic monitor
-    -m, --monitor                 Print speed info to console for
-                                  established connection
+    -m, --monitor                 Print speed info to console for established connection
     -mi, --monitor-interval INTEGER
-                                  Speed monitor interval(seconds)
-                                  [default: 3]
-  TLS Disguise configuration:     Configuration for protection
-                                  against unwanted inspection
+                                  Speed monitor interval(seconds)  [default: 3]
+  TLS Disguise configuration:     Configuration for protection against unwanted inspection
     -dti, --disguise-tls-ip TEXT  Disguised upstream TLS IP
     -dtp, --disguise-tls-port INTEGER
-                                  Disguised upstream TLS port
-                                  [default: 443]
-    --run-disguise-tls-server     Run builtin disguise TLS server
-                                  without specifying external one
-    -wl, --white-list TEXT        IP White list for legal incoming
-                                  TLS connections (comma separated)
-  Proxy configuration:            Configuration for application
-                                  proxies
+                                  Disguised upstream TLS port  [default: 443]
+    --run-disguise-tls-server     Run builtin disguise TLS server without specifying external one
+    -wl, --white-list TEXT        IP White list for legal incoming TLS connections (comma separated)
+  Proxy configuration:            Configuration for application proxies
     -e, --echo-proxy              Run as Echo server
     --shell-proxy                 Run as shell proxy server
     --http-proxy                  Run as HTTP proxy server
     --socks5-proxy                Run as SOCKS5 proxy server
-    --proxy-username TEXT         Proxy username for HTTP/SOCKS5
-                                  proxy
-    --proxy-password TEXT         Proxy password for HTTP/SOCKS5
-                                  proxy
+    --proxy-username TEXT         Proxy username for HTTP/SOCKS5 proxy
+    --proxy-password TEXT         Proxy password for HTTP/SOCKS5 proxy
     -t, --proxy-transform <TEXT INTEGER TEXT INTEGER>...
-                                  List of target
-                                  transformations(origin_host,
-                                  origin_port, transformed_host,
-                                  transformed_port) for HTTP/SOCKS5
-                                  proxy
-  Misc configuration: 
+                                  List of target transformations(origin_host, origin_port, transformed_host,
+                                  transformed_port) for HTTP/SOCKS5 proxy
+  Misc configuration:
     -v, --verbose
     --log-file PATH               Log file
   --version                       Show the version and exit.

{simple_proxy-0.0.28 → simple_proxy-0.0.30}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simple_proxy"
-version = "0.0.28"
+version = "0.0.30"
 description = "A simple NIO proxy tool"
 readme = "README.md"
 requires-python = ">=3.7, <4"
@@ -17,7 +17,7 @@ keywords = ["network", "tcp", "non-blocking", "proxy"]
 
 dependencies = [
     "click-option-group",
-    "py-netty>=1.0.5",
+    "py-netty>=1.0.8",
     "cryptography>=42.0.0",
     "attrs>=22.1.0",
 ]

{simple_proxy-0.0.28 → simple_proxy-0.0.30}/simple_proxy/__main__.py

@@ -16,7 +16,7 @@ logger = logging.getLogger(__name__)
 ))
 @optgroup.group('Common configuration', help='Configuration for local/remote endpoints')
 @optgroup.option('--listening-host', '-l', 'local_server', default='localhost', help='Listening server address', show_default=True)
-@optgroup.option('--listening-port', '-lp', 'local_port', type=int, default=8080, help='Listening port', show_default=True)
+@optgroup.option('--listening-port', '-lp', '-p', 'local_port', type=int, default=8080, help='Listening port', show_default=True)
 @optgroup.option('--global', '-g', 'using_global', is_flag=True, help='Listening on all interfaces')
 @optgroup.option('--remote-host', '-r', 'remote_server', default='localhost', help='Remote host', show_default=True)
 @optgroup.option('--remote-port', '-rp', type=int, default=80, help='Remote port', show_default=True)
@@ -25,6 +25,7 @@ logger = logging.getLogger(__name__)
 @optgroup.group('TCP proxy configuration', help='Configuration for TCP proxy mode')
 @optgroup.option('--read-delay-millis', type=int, help='Read delay(ms)', default=0, show_default=True)
 @optgroup.option('--write-delay-millis', type=int, help='Write delay(ms)', default=0, show_default=True)
+@optgroup.option('--server-name-indication', '-sni', help='Server Name Indication(SNI) for TLS connection to remote server')
 #
 @optgroup.group('Thread configuration', help='Configuration for thread')
 @optgroup.option('--workers', type=int, default=1, help='Number of worker threads', show_default=True)
@@ -64,9 +65,11 @@ logger = logging.getLogger(__name__)
 @click.version_option(prog_name='Simple Proxy', version=__version__)
 def _cli(verbose, log_file: click.Path, **kwargs):
     setup_logging(log_file, logging.INFO if verbose == 0 else logging.DEBUG)
-    if verbose:
-        logger.setLevel(logging.DEBUG)
-        logging.getLogger('simple_proxy.utils').setLevel(logging.DEBUG)
+    if verbose < 2:
+        logger.setLevel(logging.WARNING)
+        for name in ("py_netty", "simple_proxy.utils"):
+            logging.getLogger(name).setLevel(logging.WARNING)
+
     run_proxy(**kwargs)
 
 

{simple_proxy-0.0.28 → simple_proxy-0.0.30}/simple_proxy/handler/proxy_channel_handler.py

@@ -24,6 +24,7 @@ class ProxyChannelHandler(LoggingChannelHandler):
             alpn: bool = False,
             read_delay_millis: int = 0,
             write_delay_millis: int = 0,
+            sni: str | None = None,
     ):
         self._remote_host = remote_host
         self._remote_port = remote_port
@@ -42,6 +43,7 @@ class ProxyChannelHandler(LoggingChannelHandler):
         self._write_delay_millis = write_delay_millis
         self._unwritable_seconds: float = None  # noqa
         self.raddr: tuple[str, int] = None  # noqa
+        self.sni = sni
 
     def _client_channel(self, ctx0, ip, port):
 
@@ -77,7 +79,7 @@ class ProxyChannelHandler(LoggingChannelHandler):
                 tls=self._tls,
                 verify=False,
                 ssl_context_cb=alpn_ssl_context_cb if self._alpn else None,
-            ).connect(ip, port, True).sync().channel()
+            ).connect(ip, port, True, self.sni).sync().channel()
             set_keepalive(self._client.socket())
         return self._client
 

{simple_proxy-0.0.28 → simple_proxy-0.0.30}/simple_proxy/handler/shell_channel_handler.py

@@ -77,22 +77,6 @@ class ShellChannelHandler(LoggingChannelHandler):
         self._shell_stdin_fd = master_fd
         submit_daemon_thread(self.handle_read_output, ctx, master_fd)
 
-    def _setup_linux_shell0(self, ctx):
-        my_env = os.environ.copy()
-        i_r, i_w = os.pipe()
-        o_r, o_w = os.pipe()
-        self._process = subprocess.Popen(
-            [shutil.which('bash'), '-li'],
-            stdin=i_r,
-            stdout=o_w,
-            stderr=o_w,
-            bufsize=-1,
-            start_new_session=True,
-            env=my_env
-        )
-        self._shell_stdin_fd = i_w
-        submit_daemon_thread(self.handle_read_output, ctx, o_r)
-
     def channel_active(self, ctx):
         super().channel_active(ctx)
         local_socket = ctx.channel().socket()

{simple_proxy-0.0.28 → simple_proxy-0.0.30}/simple_proxy/run.py

@@ -20,6 +20,7 @@ from .utils import (
     alpn_ssl_context_cb,
     random_sentence,
 )
+from .utils.stringutils import is_ip_address
 
 
 class MyHttpHandler(http.server.BaseHTTPRequestHandler):
@@ -52,6 +53,7 @@ def run_proxy(
         proxy_username=None, proxy_password=None,
         shell_proxy=False,
         read_delay_millis=0, write_delay_millis=0,
+        server_name_indication: str | None = None,
         workers=1, proxy_workers=1,
         as_echo_server=False,
 ):
@@ -168,6 +170,7 @@ def run_proxy(
                 alpn=alpn,
                 read_delay_millis=read_delay_millis,
                 write_delay_millis=write_delay_millis,
+                sni=server_name_indication,
             ),
             certfile=cf,
             keyfile=kf,
@@ -176,6 +179,8 @@ def run_proxy(
         disguise = f"https://{disguise_tls_ip}:{disguise_tls_port}" if disguise_tls_ip else 'n/a'
         pstderr(f"Proxy server started listening: {local_server}:{local_port}{'(TLS)' if ss else ''} => {remote_server}:{remote_port}{'(TLS)' if tls else ''} ...")
         pstderr(f"console:{content}, file:{to_file}, disguise:{disguise}, whitelist:{white_list0 or '*'}")
+        if is_ip_address(remote_server) and tls and not server_name_indication:
+            pstderr("[WARN] Direct IP address is used as remote TLS server, it's recommended to specify SNI using '--server-name-indication' option!")
 
     if monitor:
         spawn_clients_monitor(monitor_interval)

{simple_proxy-0.0.28 → simple_proxy-0.0.30}/simple_proxy/utils/stringutils.py

@@ -66,3 +66,7 @@ def check_ip_patterns(patterns: list[str], s: str) -> bool:
             _get_logger().debug(f"pattern {pattern} matched {s}")
             return True
     return False
+
+def is_ip_address(s: str) -> bool:
+    ip_pattern = re.compile(r'^(\d{1,3}\.){3}\d{1,3}$')
+    return bool(ip_pattern.match(s))

{simple_proxy-0.0.28 → simple_proxy-0.0.30/simple_proxy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple_proxy
-Version: 0.0.28
+Version: 0.0.30
 Summary: A simple NIO proxy tool
 Home-page: https://github.com/ruanhao/simple-proxy
 Author-email: Hao Ruan <ruanhao1116@gmail.com>
@@ -26,7 +26,7 @@ Requires-Python: <4,>=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click-option-group
-Requires-Dist: py-netty>=1.0.5
+Requires-Dist: py-netty>=1.0.8
 Requires-Dist: cryptography>=42.0.0
 Requires-Dist: attrs>=22.1.0
 Provides-Extra: dev
@@ -43,6 +43,7 @@ Dynamic: license-file
 
 [![CI](https://github.com/ruanhao/simple-proxy/actions/workflows/ci.yml/badge.svg)](https://github.com/ruanhao/simple-proxy/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/github/ruanhao/simple-proxy/graph/badge.svg?token=812EM2WL0L)](https://codecov.io/github/ruanhao/simple-proxy)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/simple-proxy)
 
 
 
@@ -69,69 +70,53 @@ pip install simple-proxy -U
 Usage: simple-proxy [OPTIONS]
 
 Options:
-  Common configuration:           Configuration for local/remote
-                                  endpoints
-    -l, --listening-host TEXT     Listening server address
-                                  [default: localhost]
+  Common configuration:           Configuration for local/remote endpoints
+    -l, --listening-host TEXT     Listening server address  [default: localhost]
     -lp, --listening-port INTEGER
                                   Listening port  [default: 8080]
     -g, --global                  Listening on all interfaces
     -r, --remote-host TEXT        Remote host  [default: localhost]
     -rp, --remote-port INTEGER    Remote port  [default: 80]
-    -s, --tls                     Denote remote is listening on
-                                  secure port
+    -s, --tls                     Denote remote is listening on secure port
     -ss                           Listening on secure port
   TCP proxy configuration:        Configuration for TCP proxy mode
     --read-delay-millis INTEGER   Read delay(ms)  [default: 0]
     --write-delay-millis INTEGER  Write delay(ms)  [default: 0]
+    -sni, --server-name-indication TEXT
+                                  Server Name Indication(SNI) for TLS connection to remote server
   Thread configuration:           Configuration for thread
-    --workers INTEGER             Number of worker threads
-                                  [default: 1]
-    --proxy-workers INTEGER       Number of proxy threads  [default:
-                                  1]
+    --workers INTEGER             Number of worker threads  [default: 1]
+    --proxy-workers INTEGER       Number of proxy threads  [default: 1]
   Traffic dump configuration:     Configuration for traffic dump
     -c, --tcp-flow                Dump tcp flow on to console
     -f, --save-tcp-flow           Save tcp flow to file
-  TLS certificate configuration: 
+  TLS certificate configuration:
                                   Configuration for TLS certificate
     -kf, --key-file PATH          Key file for local server
     -cf, --cert-file PATH         Certificate file for local server
-    --alpn                        Set ALPN protocol as [h2,
-                                  http/1.1]
-  Traffic monitor configuration: 
+    --alpn                        Set ALPN protocol as [h2, http/1.1]
+  Traffic monitor configuration:
                                   Configuration for traffic monitor
-    -m, --monitor                 Print speed info to console for
-                                  established connection
+    -m, --monitor                 Print speed info to console for established connection
     -mi, --monitor-interval INTEGER
-                                  Speed monitor interval(seconds)
-                                  [default: 3]
-  TLS Disguise configuration:     Configuration for protection
-                                  against unwanted inspection
+                                  Speed monitor interval(seconds)  [default: 3]
+  TLS Disguise configuration:     Configuration for protection against unwanted inspection
     -dti, --disguise-tls-ip TEXT  Disguised upstream TLS IP
     -dtp, --disguise-tls-port INTEGER
-                                  Disguised upstream TLS port
-                                  [default: 443]
-    --run-disguise-tls-server     Run builtin disguise TLS server
-                                  without specifying external one
-    -wl, --white-list TEXT        IP White list for legal incoming
-                                  TLS connections (comma separated)
-  Proxy configuration:            Configuration for application
-                                  proxies
+                                  Disguised upstream TLS port  [default: 443]
+    --run-disguise-tls-server     Run builtin disguise TLS server without specifying external one
+    -wl, --white-list TEXT        IP White list for legal incoming TLS connections (comma separated)
+  Proxy configuration:            Configuration for application proxies
     -e, --echo-proxy              Run as Echo server
     --shell-proxy                 Run as shell proxy server
     --http-proxy                  Run as HTTP proxy server
     --socks5-proxy                Run as SOCKS5 proxy server
-    --proxy-username TEXT         Proxy username for HTTP/SOCKS5
-                                  proxy
-    --proxy-password TEXT         Proxy password for HTTP/SOCKS5
-                                  proxy
+    --proxy-username TEXT         Proxy username for HTTP/SOCKS5 proxy
+    --proxy-password TEXT         Proxy password for HTTP/SOCKS5 proxy
     -t, --proxy-transform <TEXT INTEGER TEXT INTEGER>...
-                                  List of target
-                                  transformations(origin_host,
-                                  origin_port, transformed_host,
-                                  transformed_port) for HTTP/SOCKS5
-                                  proxy
-  Misc configuration: 
+                                  List of target transformations(origin_host, origin_port, transformed_host,
+                                  transformed_port) for HTTP/SOCKS5 proxy
+  Misc configuration:
     -v, --verbose
     --log-file PATH               Log file
   --version                       Show the version and exit.

{simple_proxy-0.0.28 → simple_proxy-0.0.30}/simple_proxy.egg-info/SOURCES.txt

@@ -27,16 +27,17 @@ simple_proxy/utils/osutils.py
 simple_proxy/utils/proxyutils.py
 simple_proxy/utils/stringutils.py
 simple_proxy/utils/tlsutils.py
-tests/test_certutils.py
 tests/test_clients.py
-tests/test_echo_channel_handler.py
-tests/test_http_proxy_channel_handler.py
-tests/test_logutils.py
-tests/test_netutils.py
-tests/test_osutils.py
-tests/test_proxy_channel_handler.py
-tests/test_proxyutils.py
 tests/test_run.py
-tests/test_socks5_proxy_channel_handler.py
-tests/test_stringutils.py
-tests/test_tlsutils.py
+tests/handler/test_echo_channel_handler.py
+tests/handler/test_http_proxy_channel_handler.py
+tests/handler/test_proxy_channel_handler.py
+tests/handler/test_shell_channel_handler.py
+tests/handler/test_socks5_proxy_channel_handler.py
+tests/utils/test_certutils.py
+tests/utils/test_logutils.py
+tests/utils/test_netutils.py
+tests/utils/test_osutils.py
+tests/utils/test_proxyutils.py
+tests/utils/test_stringutils.py
+tests/utils/test_tlsutils.py

{simple_proxy-0.0.28 → simple_proxy-0.0.30}/simple_proxy.egg-info/requires.txt

@@ -1,5 +1,5 @@
 click-option-group
-py-netty>=1.0.5
+py-netty>=1.0.8
 cryptography>=42.0.0
 attrs>=22.1.0
 

{simple_proxy-0.0.28 → simple_proxy-0.0.30}/simple_proxy.egg-info/top_level.txt

@@ -5,3 +5,4 @@ img
 simple_proxy
 test_dir
 tests
+venv

simple_proxy-0.0.30/tests/handler/test_echo_channel_handler.py

@@ -0,0 +1,42 @@
+from simple_proxy.handler.echo_channel_handler import EchoChannelHandler
+from py_netty import EventLoopGroup
+from simple_proxy.clients import get_clients
+import pytest
+
+
+@pytest.fixture(scope='function', autouse=False)
+def ctx_mocker(mocker):
+    return mocker.MagicMock()
+
+
+class TestChannelRead:
+
+    def test_with_client(self, mocker, ctx_mocker):
+        raddr = ('127.0.0.1', 8080)
+        ctx_mocker.channel.return_value.channelinfo.return_value.peername = raddr
+        handler = EchoChannelHandler(EventLoopGroup(), tls=False)
+
+        client_mocker = mocker.MagicMock()
+        get_clients()[raddr] = client_mocker
+        handler.channel_read(ctx_mocker, b'123')
+        ctx_mocker.channel().write.assert_called_once_with(b'123')
+        client_mocker.read.assert_called_once_with(3)
+        client_mocker.write.assert_called_once_with(3)
+
+    def test_without_client(self, ctx_mocker):
+        raddr = ('127.0.0.1', 8080)
+        ctx_mocker.channel.return_value.channelinfo.return_value.peername = raddr
+        handler = EchoChannelHandler(EventLoopGroup(), tls=False)
+
+        get_clients().clear()
+        handler.channel_read(ctx_mocker, b'123')
+        assert ctx_mocker.channel.called
+        ctx_mocker.channel().write.assert_called_once_with(b'123')
+
+    def test_empty(self, ctx_mocker):
+        raddr = ('127.0.0.1', 8080)
+        ctx_mocker.channel.return_value.channelinfo.return_value.peername = raddr
+
+        handler = EchoChannelHandler(EventLoopGroup(), tls=False)
+        handler.channel_read(ctx_mocker, b'')
+        assert not ctx_mocker.channel.called