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

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

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: simple_proxy
-Version: 0.0.26
-Summary: A very simple NIO TCP proxy server
+Version: 0.0.28
+Summary: A simple NIO proxy tool
 Home-page: https://github.com/ruanhao/simple-proxy
-Author: Hao Ruan
-Author-email: ruanhao1116@gmail.com
+Author-email: Hao Ruan <ruanhao1116@gmail.com>
 License: MIT
+Project-URL: Homepage, https://github.com/ruanhao/simple-proxy
 Keywords: network,tcp,non-blocking,proxy
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -22,28 +22,30 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.7, <4
+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: cryptography>=42.0.0
 Requires-Dist: attrs>=22.1.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
+Provides-Extra: dev
+Requires-Dist: pip-chill; extra == "dev"
+Provides-Extra: test
+Requires-Dist: pytest>=7.4.0; extra == "test"
+Requires-Dist: pytest-cov>=4.1.0; extra == "test"
+Requires-Dist: pytest-asyncio>=0.21.0; extra == "test"
+Requires-Dist: pytest-mock>=3.11.1; extra == "test"
+Requires-Dist: coverage[toml]>=7.3.0; extra == "test"
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # simple-proxy :rocket:
 
+[![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)
+
+
+
 A very simple TCP proxy tool empowered by nio tcp framework [py-netty](https://pypi.org/project/py-netty/)
 
 There is a simple traffic control mechenism between 2 segments of TCP connection:
@@ -69,23 +71,20 @@ Usage: simple-proxy [OPTIONS]
 Options:
   Common configuration:           Configuration for local/remote
                                   endpoints
-    -l, --local-server TEXT       Local server address  [default:
-                                  localhost]
-    -lp, --local-port INTEGER     Local port  [default: 8080]
-    -g, --global                  Local port listening on all
-                                  interfaces
-    -r, --remote-server TEXT      Remote server address  [default:
-                                  localhost]
+    -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
-    -ss                           Make local listen on secure port
+    -ss                           Listening on secure port
   TCP proxy configuration:        Configuration for TCP proxy mode
-    --read-delay-millis INTEGER   Read delay in milliseconds
-                                  [default: 0]
-    --write-delay-millis INTEGER  Write delay in milliseconds
-                                  [default: 0]
-  Thread configuration:           Configuration for thread pool
+    --read-delay-millis INTEGER   Read delay(ms)  [default: 0]
+    --write-delay-millis INTEGER  Write delay(ms)  [default: 0]
+  Thread configuration:           Configuration for thread
     --workers INTEGER             Number of worker threads
                                   [default: 1]
     --proxy-workers INTEGER       Number of proxy threads  [default:
@@ -104,8 +103,8 @@ Options:
     -m, --monitor                 Print speed info to console for
                                   established connection
     -mi, --monitor-interval INTEGER
-                                  Speed monitor interval  [default:
-                                  3]
+                                  Speed monitor interval(seconds)
+                                  [default: 3]
   TLS Disguise configuration:     Configuration for protection
                                   against unwanted inspection
     -dti, --disguise-tls-ip TEXT  Disguised upstream TLS IP
@@ -116,18 +115,22 @@ Options:
                                   without specifying external one
     -wl, --white-list TEXT        IP White list for legal incoming
                                   TLS connections (comma separated)
-  Proxy configuration:            Configuration for proxy
-    -e, --as-echo-server          Run as Echo server
+  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
-    --proxy-password TEXT         Proxy password
+    --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)
+                                  transformed_port) for HTTP/SOCKS5
+                                  proxy
   Misc configuration: 
     -v, --verbose
     --log-file PATH               Log file

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

@@ -1,5 +1,10 @@
 # simple-proxy :rocket:
 
+[![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)
+
+
+
 A very simple TCP proxy tool empowered by nio tcp framework [py-netty](https://pypi.org/project/py-netty/)
 
 There is a simple traffic control mechenism between 2 segments of TCP connection:
@@ -25,23 +30,20 @@ Usage: simple-proxy [OPTIONS]
 Options:
   Common configuration:           Configuration for local/remote
                                   endpoints
-    -l, --local-server TEXT       Local server address  [default:
-                                  localhost]
-    -lp, --local-port INTEGER     Local port  [default: 8080]
-    -g, --global                  Local port listening on all
-                                  interfaces
-    -r, --remote-server TEXT      Remote server address  [default:
-                                  localhost]
+    -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
-    -ss                           Make local listen on secure port
+    -ss                           Listening on secure port
   TCP proxy configuration:        Configuration for TCP proxy mode
-    --read-delay-millis INTEGER   Read delay in milliseconds
-                                  [default: 0]
-    --write-delay-millis INTEGER  Write delay in milliseconds
-                                  [default: 0]
-  Thread configuration:           Configuration for thread pool
+    --read-delay-millis INTEGER   Read delay(ms)  [default: 0]
+    --write-delay-millis INTEGER  Write delay(ms)  [default: 0]
+  Thread configuration:           Configuration for thread
     --workers INTEGER             Number of worker threads
                                   [default: 1]
     --proxy-workers INTEGER       Number of proxy threads  [default:
@@ -60,8 +62,8 @@ Options:
     -m, --monitor                 Print speed info to console for
                                   established connection
     -mi, --monitor-interval INTEGER
-                                  Speed monitor interval  [default:
-                                  3]
+                                  Speed monitor interval(seconds)
+                                  [default: 3]
   TLS Disguise configuration:     Configuration for protection
                                   against unwanted inspection
     -dti, --disguise-tls-ip TEXT  Disguised upstream TLS IP
@@ -72,18 +74,22 @@ Options:
                                   without specifying external one
     -wl, --white-list TEXT        IP White list for legal incoming
                                   TLS connections (comma separated)
-  Proxy configuration:            Configuration for proxy
-    -e, --as-echo-server          Run as Echo server
+  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
-    --proxy-password TEXT         Proxy password
+    --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)
+                                  transformed_port) for HTTP/SOCKS5
+                                  proxy
   Misc configuration: 
     -v, --verbose
     --log-file PATH               Log file

simple_proxy-0.0.28/pyproject.toml

@@ -0,0 +1,67 @@
+[build-system]
+requires = ["setuptools>=61", "wheel"]
+build-backend = "setuptools.build_meta"
+
+
+[project]
+name = "simple_proxy"
+version = "0.0.28"
+description = "A simple NIO proxy tool"
+readme = "README.md"
+requires-python = ">=3.7, <4"
+license = { text = "MIT" }
+authors = [
+    { name = "Hao Ruan", email = "ruanhao1116@gmail.com" },
+]
+keywords = ["network", "tcp", "non-blocking", "proxy"]
+
+dependencies = [
+    "click-option-group",
+    "py-netty>=1.0.5",
+    "cryptography>=42.0.0",
+    "attrs>=22.1.0",
+]
+
+classifiers = [
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Natural Language :: English",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3 :: Only",
+    "Topic :: Software Development :: Libraries",
+]
+
+[project.urls]
+Homepage = "https://github.com/ruanhao/simple-proxy"
+
+
+[project.scripts]
+simple-proxy = "simple_proxy.__main__:_run"
+
+
+[tool.setuptools]
+packages = { find = {} }
+
+[tool.setuptools.package-data]
+simple_proxy = ["*"]
+
+[project.optional-dependencies]
+dev = [
+    "pip-chill" # used to generate requirements-chill.txt
+]
+test = [
+    "pytest>=7.4.0",
+    "pytest-cov>=4.1.0",
+    "pytest-asyncio>=0.21.0",
+    "pytest-mock>=3.11.1",
+    "coverage[toml]>=7.3.0"
+]

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

@@ -15,18 +15,18 @@ logger = logging.getLogger(__name__)
     max_content_width=shutil.get_terminal_size().columns - 10,
 ))
 @optgroup.group('Common configuration', help='Configuration for local/remote endpoints')
-@optgroup.option('--local-server', '-l', default='localhost', help='Local server address', show_default=True)
-@optgroup.option('--local-port', '-lp', type=int, default=8080, help='Local port', show_default=True)
-@optgroup.option('--global', '-g', 'using_global', is_flag=True, help='Local port listening on all interfaces')
-@optgroup.option('--remote-server', '-r', default='localhost', help='Remote server address', show_default=True)
+@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('--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)
 @optgroup.option('--tls', '-s', is_flag=True, help='Denote remote is listening on secure port')
-@optgroup.option('-ss', is_flag=True, help='Make local listen on secure port')
+@optgroup.option('-ss', is_flag=True, help='Listening on secure port')
 @optgroup.group('TCP proxy configuration', help='Configuration for TCP proxy mode')
-@optgroup.option('--read-delay-millis', type=int, help='Read delay in milliseconds', default=0, show_default=True)
-@optgroup.option('--write-delay-millis', type=int, help='Write delay in milliseconds', default=0, show_default=True)
+@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.group('Thread configuration', help='Configuration for thread pool')
+@optgroup.group('Thread configuration', help='Configuration for thread')
 @optgroup.option('--workers', type=int, default=1, help='Number of worker threads', show_default=True)
 @optgroup.option('--proxy-workers', type=int, default=1, help='Number of proxy threads', show_default=True)
 #
@@ -41,7 +41,7 @@ logger = logging.getLogger(__name__)
 #
 @optgroup.group('Traffic monitor configuration', help='Configuration for traffic monitor')
 @optgroup.option('--monitor', '-m', is_flag=True, help='Print speed info to console for established connection')
-@optgroup.option('--monitor-interval', '-mi', type=int, default=3, help='Speed monitor interval', show_default=True)
+@optgroup.option('--monitor-interval', '-mi', type=int, default=3, help='Speed monitor interval(seconds)', show_default=True)
 #
 @optgroup.group('TLS Disguise configuration', help='Configuration for protection against unwanted inspection')
 @optgroup.option('--disguise-tls-ip', '-dti', help='Disguised upstream TLS IP')
@@ -49,14 +49,14 @@ logger = logging.getLogger(__name__)
 @optgroup.option('--run-disguise-tls-server', is_flag=True, help='Run builtin disguise TLS server without specifying external one')
 @optgroup.option('--white-list', '-wl', help='IP White list for legal incoming TLS connections (comma separated)')
 #
-@optgroup.group('Proxy configuration', help='Configuration for proxy')
-@optgroup.option('--as-echo-server', '-e', is_flag=True, help='Run as Echo server')
+@optgroup.group('Proxy configuration', help='Configuration for application proxies')
+@optgroup.option('--echo-proxy', '-e', 'as_echo_server', is_flag=True, help='Run as Echo server')
 @optgroup.option('--shell-proxy', is_flag=True, help='Run as shell proxy server')
 @optgroup.option('--http-proxy', is_flag=True, help='Run as HTTP proxy server')
 @optgroup.option('--socks5-proxy', is_flag=True, help='Run as SOCKS5 proxy server')
-@optgroup.option('--proxy-username', help='Proxy username')
-@optgroup.option('--proxy-password', help='Proxy password')
-@optgroup.option('--proxy-transform', '-t', type=(str, int, str, int), multiple=True, help='List of target transformations(origin_host, origin_port, transformed_host, transformed_port)')
+@optgroup.option('--proxy-username', help='Proxy username for HTTP/SOCKS5 proxy')
+@optgroup.option('--proxy-password', help='Proxy password for HTTP/SOCKS5 proxy')
+@optgroup.option('--proxy-transform', '-t', type=(str, int, str, int), multiple=True, help='List of target transformations(origin_host, origin_port, transformed_host, transformed_port) for HTTP/SOCKS5 proxy')
 #
 @optgroup.group('Misc configuration')
 @optgroup.option('-v', '--verbose', count=True)

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

@@ -90,12 +90,10 @@ def run_proxy(
         server_address = (disguise_tls_ip, disguise_tls_port)
         kf_mock, cf_mock = create_temp_key_cert()
         httpd = http.server.HTTPServer(server_address, MyHttpHandler)  # noqa
-        httpd.socket = ssl.wrap_socket(httpd.socket,
-                                       server_side=True,
-                                       certfile=cf_mock,
-                                       keyfile=kf_mock,
-                                       ssl_version=ssl.PROTOCOL_TLS)
-        pstderr(f"Builin disguise TLS server started listening(https://localhost:{disguise_tls_port}) ...")
+        context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+        context.load_cert_chain(certfile=cf_mock, keyfile=kf_mock)
+        httpd.socket = context.wrap_socket(httpd.socket, server_side=True)
+        pstderr(f"Builtin disguise TLS server started listening(https://localhost:{disguise_tls_port}) ...")
         submit_daemon_thread(httpd.serve_forever)
 
     client_eventloop_group = EventLoopGroup(proxy_workers, 'Client')

{simple_proxy-0.0.26 → simple_proxy-0.0.28}/simple_proxy/utils/proxyutils.py

@@ -48,6 +48,6 @@ def trim_proxy_info(request_headers_bytes: bytes) -> bytes:
     trimmed = request_headers_bytes
     trimmed = re.sub(b'Proxy-.*\r\n', b'', trimmed, flags=re.IGNORECASE)
     # remove host in url line
-    trimmed = re.sub(b'^(GET|POST|PUT|DELETE|HEAD|OPTIONS|PATCH|TRACE|CONNECT)\s+http://[\w\.-]+(:\d+)?/',
+    trimmed = re.sub(br'^(GET|POST|PUT|DELETE|HEAD|OPTIONS|PATCH|TRACE|CONNECT)\s+http://[\w\.-]+(:\d+)?/',
                      lambda m: m.group(1) + b' /', trimmed, flags=re.IGNORECASE | re.MULTILINE)
     return trimmed

simple_proxy-0.0.28/simple_proxy/version.py

@@ -0,0 +1,10 @@
+try:
+    from importlib.metadata import version, PackageNotFoundError
+except ImportError:
+    # Python < 3.8
+    from importlib_metadata import version, PackageNotFoundError
+
+try:
+    __version__ = version("simple_proxy")
+except PackageNotFoundError:
+    __version__ = "0.0.0-dev"

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

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: simple_proxy
-Version: 0.0.26
-Summary: A very simple NIO TCP proxy server
+Version: 0.0.28
+Summary: A simple NIO proxy tool
 Home-page: https://github.com/ruanhao/simple-proxy
-Author: Hao Ruan
-Author-email: ruanhao1116@gmail.com
+Author-email: Hao Ruan <ruanhao1116@gmail.com>
 License: MIT
+Project-URL: Homepage, https://github.com/ruanhao/simple-proxy
 Keywords: network,tcp,non-blocking,proxy
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -22,28 +22,30 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.7, <4
+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: cryptography>=42.0.0
 Requires-Dist: attrs>=22.1.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
+Provides-Extra: dev
+Requires-Dist: pip-chill; extra == "dev"
+Provides-Extra: test
+Requires-Dist: pytest>=7.4.0; extra == "test"
+Requires-Dist: pytest-cov>=4.1.0; extra == "test"
+Requires-Dist: pytest-asyncio>=0.21.0; extra == "test"
+Requires-Dist: pytest-mock>=3.11.1; extra == "test"
+Requires-Dist: coverage[toml]>=7.3.0; extra == "test"
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # simple-proxy :rocket:
 
+[![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)
+
+
+
 A very simple TCP proxy tool empowered by nio tcp framework [py-netty](https://pypi.org/project/py-netty/)
 
 There is a simple traffic control mechenism between 2 segments of TCP connection:
@@ -69,23 +71,20 @@ Usage: simple-proxy [OPTIONS]
 Options:
   Common configuration:           Configuration for local/remote
                                   endpoints
-    -l, --local-server TEXT       Local server address  [default:
-                                  localhost]
-    -lp, --local-port INTEGER     Local port  [default: 8080]
-    -g, --global                  Local port listening on all
-                                  interfaces
-    -r, --remote-server TEXT      Remote server address  [default:
-                                  localhost]
+    -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
-    -ss                           Make local listen on secure port
+    -ss                           Listening on secure port
   TCP proxy configuration:        Configuration for TCP proxy mode
-    --read-delay-millis INTEGER   Read delay in milliseconds
-                                  [default: 0]
-    --write-delay-millis INTEGER  Write delay in milliseconds
-                                  [default: 0]
-  Thread configuration:           Configuration for thread pool
+    --read-delay-millis INTEGER   Read delay(ms)  [default: 0]
+    --write-delay-millis INTEGER  Write delay(ms)  [default: 0]
+  Thread configuration:           Configuration for thread
     --workers INTEGER             Number of worker threads
                                   [default: 1]
     --proxy-workers INTEGER       Number of proxy threads  [default:
@@ -104,8 +103,8 @@ Options:
     -m, --monitor                 Print speed info to console for
                                   established connection
     -mi, --monitor-interval INTEGER
-                                  Speed monitor interval  [default:
-                                  3]
+                                  Speed monitor interval(seconds)
+                                  [default: 3]
   TLS Disguise configuration:     Configuration for protection
                                   against unwanted inspection
     -dti, --disguise-tls-ip TEXT  Disguised upstream TLS IP
@@ -116,18 +115,22 @@ Options:
                                   without specifying external one
     -wl, --white-list TEXT        IP White list for legal incoming
                                   TLS connections (comma separated)
-  Proxy configuration:            Configuration for proxy
-    -e, --as-echo-server          Run as Echo server
+  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
-    --proxy-password TEXT         Proxy password
+    --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)
+                                  transformed_port) for HTTP/SOCKS5
+                                  proxy
   Misc configuration: 
     -v, --verbose
     --log-file PATH               Log file

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

@@ -1,7 +1,7 @@
 LICENSE
 README.md
+pyproject.toml
 setup.cfg
-setup.py
 simple_proxy/__init__.py
 simple_proxy/__main__.py
 simple_proxy/clients.py

simple_proxy-0.0.28/simple_proxy.egg-info/requires.txt

@@ -0,0 +1,14 @@
+click-option-group
+py-netty>=1.0.5
+cryptography>=42.0.0
+attrs>=22.1.0
+
+[dev]
+pip-chill
+
+[test]
+pytest>=7.4.0
+pytest-cov>=4.1.0
+pytest-asyncio>=0.21.0
+pytest-mock>=3.11.1
+coverage[toml]>=7.3.0

simple_proxy-0.0.28/simple_proxy.egg-info/top_level.txt

@@ -0,0 +1,7 @@
+__tcpflow__
+build
+htmlcov
+img
+simple_proxy
+test_dir
+tests

{simple_proxy-0.0.26 → simple_proxy-0.0.28}/tests/test_clients.py

@@ -76,14 +76,14 @@ def test_handle_data_case_client_rw(mocker):
     client_mocker = mocker.MagicMock()
     get_clients()[('127.0.0.1', 12345)] = client_mocker
     assert handle_data(buffer, True, src, dst, False, False) == buffer
-    assert client_mocker.read.called_once_with(len(buffer))
+    client_mocker.read.assert_called_once_with(len(buffer))
     assert not client_mocker.write.called
 
     # write case
     client_mocker = mocker.MagicMock()
     get_clients()[('8.8.8.8', 54321)] = client_mocker
     assert handle_data(buffer, False, src, dst, False, False) == buffer
-    assert client_mocker.write.called_once_with(len(buffer))
+    client_mocker.write.assert_called_once_with(len(buffer))
     assert not client_mocker.read.called
 
 def test_handle_data_case_log_data(mocker):
@@ -124,10 +124,10 @@ def test_tcp_proxy_client():
     time.sleep(1.1)
     c1.read(1100)
     c1.write(1200)
-    assert c1.rbps >= 1000
-    assert c1.wbps >= 1000
-    assert TcpProxyClient.max_rx >= 1000
-    assert TcpProxyClient.max_tx >= 1000
+    assert c1.rbps >= 900
+    assert c1.wbps >= 900
+    assert TcpProxyClient.max_rx >= 900
+    assert TcpProxyClient.max_tx >= 900
     assert c1.cumulative_read_time == 0
     assert c1.cumulative_read_bytes == 0
     assert c1.cumulative_write_time == 0

{simple_proxy-0.0.26 → simple_proxy-0.0.28}/tests/test_osutils.py

@@ -4,6 +4,14 @@ import time
 import logging
 import threading
 
+
+class TestOS:
+
+    def test_os(self):
+        print("test os")
+        pass
+
+
 def test_from_cwd():
     ts_str = str(int(time.time()))
     test_path = from_cwd('test_dir', ts_str, 'test_file.txt')
@@ -14,6 +22,7 @@ def test_from_cwd():
 def test_submit_daemon_thread(caplog):
     result = []
     logger = logging.getLogger(__name__)
+
     def sample_function(x, y):
         time.sleep(0.1)
         result.append(x + y)

{simple_proxy-0.0.26 → simple_proxy-0.0.28}/tests/test_proxy_channel_handler.py

@@ -6,6 +6,7 @@ from simple_proxy.clients import get_clients
 
 raddr = ('127.0.0.1', 8080)
 
+
 def test_exception_caught(mocker):
     handler = ProxyChannelHandler("1.2.3.4", 9090, EventLoopGroup())
     ctx_mocker = mocker.MagicMock()
@@ -26,6 +27,7 @@ def test_channel_active(mocker):
     handler.channel_active(ctx_mocker)
     assert raddr in get_clients()
 
+
 def test_create_client_case_already_exists(mocker):
     handler = ProxyChannelHandler(
         "1.2.3.4", 9090, EventLoopGroup(),
@@ -33,6 +35,7 @@ def test_create_client_case_already_exists(mocker):
     handler._client = mocker.MagicMock()
     handler._create_client(None, None)  # no exception should be raised
 
+
 def test_create_client_case_disguise_and_wait_for_traffic(mocker):
     handler = ProxyChannelHandler(
         "1.2.3.4", 9090, EventLoopGroup(),
@@ -41,6 +44,7 @@ def test_create_client_case_disguise_and_wait_for_traffic(mocker):
     handler._client = mocker.MagicMock()
     handler._create_client(None, None)  # no exception should be raised
 
+
 def test_create_client_case_non_whitelist_with_disguise(mocker):
     handler = ProxyChannelHandler(
         "1.2.3.4", 9090, EventLoopGroup(),
@@ -59,6 +63,7 @@ def test_create_client_case_non_whitelist_with_disguise(mocker):
     assert BoostrapMocker().connect.call_args[0] == ("4.3.2.1", 443, True)
     assert handler._client is client_mocker
 
+
 def test_create_client_case_non_whitelist_with_disguise_but_not_tls(mocker):
     handler = ProxyChannelHandler(
         "1.2.3.4", 9090, EventLoopGroup(),
@@ -160,10 +165,11 @@ def test_create_client_case_no_wl_and_disguise_configured(mocker):
     )
     BoostrapMocker.return_value.connect.return_value.sync.return_value.channel.return_value = client_mocker
 
-    handler._create_client(ctx_mocker, None) # channel active
+    handler._create_client(ctx_mocker, None)  # channel active
     assert handler._client is client_mocker
     assert BoostrapMocker().connect.call_args[0] == ("1.2.3.4", 9090, True)
 
+
 def test_channel_inactive(mocker):
     handler = ProxyChannelHandler("1.2.3.4", 8080, EventLoopGroup())
     ctx_mocker = mocker.MagicMock()
@@ -209,6 +215,7 @@ def test_channel_read_case_no_delay(mocker):
     assert time.time() - now < 0.5  # no delay
     client_mocker.write.assert_called_once_with(b'test data')
 
+
 def test_channel_read_case_write_delay(mocker):
     handler = ProxyChannelHandler(
         "1.2.3.4", 8080, EventLoopGroup(),
@@ -244,15 +251,14 @@ def _get_client_channel_handler(mocker, ctx0_mocker, read_delay_millis=0):
     return BoostrapMocker.call_args[1]['handler_initializer']
 
 
-
-
 def test_client_channel_inactive(mocker):
     ctx0_mocker = mocker.MagicMock()
     ctx0_mocker.channel.return_value.socket.return_value.getpeername.return_value = ("10.1.0.1", 12345)
     handler_cls = _get_client_channel_handler(mocker, ctx0_mocker)
     ctx_mocker = mocker.MagicMock()
     handler_cls().channel_inactive(ctx_mocker)
-    assert ctx0_mocker.close.called_once()
+    ctx0_mocker.close.assert_called_once()
+
 
 def test_client_channel_writability_changed(mocker):
     ctx0_mocker = mocker.MagicMock()
@@ -286,6 +292,7 @@ def test_client_channel_read_case_no_delay(mocker):
     assert time.time() - now < 0.5  # no delay
     ctx0_mocker.write.assert_called_once_with(b'test data')
 
+
 def test_client_channel_read_case_delay(mocker):
     ctx0_mocker = mocker.MagicMock()
     ctx0_mocker.channel.return_value.socket.return_value.getpeername.return_value = ("10.1.0.1", 12345)
@@ -298,4 +305,4 @@ def test_client_channel_read_case_delay(mocker):
     handler = handler_cls()
     handler.channel_read(ctx_mocker, b'test data')
     assert time.time() - now >= 1
-    ctx0_mocker.write.assert_called_once_with(b'test data')
+    ctx0_mocker.write.assert_called_once_with(b'test data')

{simple_proxy-0.0.26 → simple_proxy-0.0.28}/tests/test_run.py

@@ -1,9 +1,8 @@
-from fastmcp.contrib.bulk_tool_caller.example import echo_tool
-
 from simple_proxy.run import run_proxy
 import pytest
 from simple_proxy.handler.shell_channel_handler import ShellChannelHandler
 
+
 def test_run_proxy_case_tls_mode_with_both_disguise_ip_and_server():
     with pytest.raises(SystemExit):
         run_proxy(
@@ -19,6 +18,7 @@ def test_run_proxy_case_tls_mode_with_both_disguise_ip_and_server():
             run_disguise_tls_server=True,
         )
 
+
 def test_run_proxy_case_tcp_proxy(mocker):
     ServerBoostrapMocker = mocker.patch('simple_proxy.run.ServerBootstrap')
     run_proxy(
@@ -32,8 +32,8 @@ def test_run_proxy_case_tcp_proxy(mocker):
         monitor_interval=3,
         disguise_tls_ip="1.2.3.4",
         disguise_tls_port=443,
-        run_disguise_tls_server = False,
-        alpn = True,
+        run_disguise_tls_server=False,
+        alpn=True,
         read_delay_millis=100,
         write_delay_millis=200,
         workers=2,
@@ -64,7 +64,6 @@ def test_run_proxy_case_tcp_proxy(mocker):
     assert ServerBoostrapMocker.return_value.bind.call_args[1]['port'] == 8081
 
 
-
 def test_run_proxy_case_http_proxy(mocker):
     ServerBoostrapMocker = mocker.patch('simple_proxy.run.ServerBootstrap')
     run_proxy(
@@ -78,11 +77,11 @@ def test_run_proxy_case_http_proxy(mocker):
         monitor_interval=3,
         disguise_tls_ip=None,
         disguise_tls_port=443,
-        run_disguise_tls_server = False,
-        alpn = True,
-        read_delay_millis = 100,
-        write_delay_millis = 200,
-        workers = 4,
+        run_disguise_tls_server=False,
+        alpn=True,
+        read_delay_millis=100,
+        write_delay_millis=200,
+        workers=4,
         http_proxy=True,
         proxy_transform=(('example.com', 80, 'transformed.com', 8080),),
         proxy_workers=2,
@@ -104,6 +103,7 @@ def test_run_proxy_case_http_proxy(mocker):
     assert http_proxy_channel_handler._proxy_username == "cisco"
     assert http_proxy_channel_handler._proxy_password == "juniper"
 
+
 def test_run_proxy_case_socks5_proxy(mocker):
     ServerBoostrapMocker = mocker.patch('simple_proxy.run.ServerBootstrap')
     run_proxy(
@@ -117,11 +117,11 @@ def test_run_proxy_case_socks5_proxy(mocker):
         monitor_interval=3,
         disguise_tls_ip=None,
         disguise_tls_port=443,
-        run_disguise_tls_server = False,
-        alpn = True,
-        read_delay_millis = 100,
-        write_delay_millis = 200,
-        workers = 4,
+        run_disguise_tls_server=False,
+        alpn=True,
+        read_delay_millis=100,
+        write_delay_millis=200,
+        workers=4,
         socks5_proxy=True,
         proxy_transform=(('example.com', 80, 'transformed.com', 8080),),
         proxy_workers=2,
@@ -145,6 +145,7 @@ def test_run_proxy_case_socks5_proxy(mocker):
     assert ServerBoostrapMocker.return_value.bind.call_args[1]['address'] == '127.0.0.2'
     assert ServerBoostrapMocker.return_value.bind.call_args[1]['port'] == 8081
 
+
 def test_run_proxy_case_shell_proxy(mocker):
     ServerBoostrapMocker = mocker.patch('simple_proxy.run.ServerBootstrap')
     run_proxy(
@@ -158,11 +159,11 @@ def test_run_proxy_case_shell_proxy(mocker):
         monitor_interval=3,
         disguise_tls_ip=None,
         disguise_tls_port=443,
-        run_disguise_tls_server = False,
-        alpn = True,
-        read_delay_millis = 100,
-        write_delay_millis = 200,
-        workers = 4,
+        run_disguise_tls_server=False,
+        alpn=True,
+        read_delay_millis=100,
+        write_delay_millis=200,
+        workers=4,
         shell_proxy=True,
     )
     kwargs = ServerBoostrapMocker.call_args[1]
@@ -189,11 +190,11 @@ def test_run_proxy_case_echo_server(mocker):
         monitor_interval=3,
         disguise_tls_ip=None,
         disguise_tls_port=443,
-        run_disguise_tls_server = False,
-        alpn = True,
-        read_delay_millis = 100,
-        write_delay_millis = 200,
-        workers = 4,
+        run_disguise_tls_server=False,
+        alpn=True,
+        read_delay_millis=100,
+        write_delay_millis=200,
+        workers=4,
         as_echo_server=True,
         proxy_workers=8,
     )
@@ -207,6 +208,7 @@ def test_run_proxy_case_echo_server(mocker):
     assert echo_channel_handler._client_eventloop_group.num == 8
     assert echo_channel_handler._tls is True
 
+
 def test_run_disguise_tls_server(mocker):
     mocker.patch('simple_proxy.run.ServerBootstrap')
     submit_daemon_thread_mocker = mocker.patch('simple_proxy.run.submit_daemon_thread')
@@ -221,14 +223,15 @@ def test_run_disguise_tls_server(mocker):
         monitor_interval=3,
         disguise_tls_ip=None,
         disguise_tls_port=443,
-        run_disguise_tls_server = True,
-        alpn = True,
-        read_delay_millis = 100,
-        write_delay_millis = 200,
-        workers = 4,
+        run_disguise_tls_server=True,
+        alpn=True,
+        read_delay_millis=100,
+        write_delay_millis=200,
+        workers=4,
     )
     submit_daemon_thread_mocker.assert_called_once()
 
+
 def test_run_monitor(mocker):
     mocker.patch('simple_proxy.run.ServerBootstrap')
     spawn_clients_monitor_mocker = mocker.patch('simple_proxy.run.spawn_clients_monitor')
@@ -243,10 +246,10 @@ def test_run_monitor(mocker):
         monitor_interval=30,
         disguise_tls_ip=None,
         disguise_tls_port=443,
-        run_disguise_tls_server = False,
-        alpn = True,
-        read_delay_millis = 100,
-        write_delay_millis = 200,
-        workers = 4,
+        run_disguise_tls_server=False,
+        alpn=True,
+        read_delay_millis=100,
+        write_delay_millis=200,
+        workers=4,
     )
-    spawn_clients_monitor_mocker.assert_called_once_with(30)
+    spawn_clients_monitor_mocker.assert_called_once_with(30)

{simple_proxy-0.0.26 → simple_proxy-0.0.28}/tests/test_socks5_proxy_channel_handler.py

@@ -212,7 +212,7 @@ def test_channel_read_case_authenticate_with_wrong_password(mocker):
     handler.channel_read(ctx, b'\x05\x01\x02')
     ctx.write.assert_called_with(b'\x05\x02')  # USERNAME/PASSWORD authentication
 
-    with pytest.raises(ValueError, match="Authentication failed: cisco/\*\*\*\*\*\*\*\*"):
+    with pytest.raises(ValueError, match=r"Authentication failed: cisco/\*\*\*\*\*\*\*\*"):
         handler.channel_read(ctx, b'\x01\x05') # Version 1
         handler.channel_read(ctx, b'cis')
         handler.channel_read(ctx, b'co')

simple_proxy-0.0.26/setup.py

@@ -1,53 +0,0 @@
-# setup.py
-from setuptools import setup, find_packages
-from pathlib import Path
-
-this_directory = Path(__file__).parent
-long_description = (this_directory / "README.md").read_text()
-# install_requires = (this_directory / 'requirements.txt').read_text().splitlines()
-
-__version__ = None
-
-exec(open("simple_proxy/version.py").read())
-
-config = {
-    'name': 'simple_proxy',
-    'url': 'https://github.com/ruanhao/simple-proxy',
-    'license': 'MIT',
-    "long_description": long_description,
-    "long_description_content_type": 'text/markdown',
-    'description': 'A very simple NIO TCP proxy server',
-    'author' : 'Hao Ruan',
-    'author_email': 'ruanhao1116@gmail.com',
-    'keywords': ['network', 'tcp', 'non-blocking', 'proxy'],
-    'version': __version__,
-    'packages': find_packages(),
-    'install_requires': ['click-option-group', 'py-netty>=1.0.5', 'cryptography>=42.0.0', 'attrs>=22.1.0'],
-    'python_requires': ">=3.7, <4",
-    'setup_requires': ['wheel'],
-    'package_data': {'simple_proxy': ['*']},
-    'entry_points': {
-        'console_scripts': [
-            'simple-proxy = simple_proxy.__main__:_run',
-        ],
-    },
-    'classifiers': [
-        "Intended Audience :: Developers",
-        'License :: OSI Approved :: MIT License',
-        "Natural Language :: English",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "Programming Language :: Python :: 3.13",
-        "Programming Language :: Python :: 3 :: Only",
-        "Topic :: Software Development :: Libraries",
-    ],
-}
-
-setup(**config)

simple_proxy-0.0.26/simple_proxy/version.py

@@ -1 +0,0 @@
-__version__ = "0.0.26"

simple_proxy-0.0.26/simple_proxy.egg-info/requires.txt

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

simple_proxy-0.0.26/simple_proxy.egg-info/top_level.txt

@@ -1 +0,0 @@
-simple_proxy