wisp-python 0.8.0__py3-none-any.whl → 0.8.2__py3-none-any.whl

wisp/server/cli.py

@@ -48,6 +48,8 @@ def main():
   parser.add_argument("--log-level", default="info", help="The log level (either debug, info, warning, error, or critical).")
   parser.add_argument("--threads", default=0, help="The number of threads to run the server on. By default it uses all CPU cores. (Linux only)")
   parser.add_argument("--proxy", default=None, help="The url of the socks5h, socks5, sock4a, socks4 or http proxy to use.")
+  parser.add_argument("--block-udp", action="store_true", help="Block UDP streams.")
+  parser.add_argument("--block-tcp", action="store_true", help="Block TCP streams.")
   args = parser.parse_args()
 
   logging.basicConfig(

wisp/server/http.py

@@ -86,6 +86,8 @@ async def main(args):
 
   net.block_loopback = not args.allow_loopback
   net.block_private = not args.allow_private
+  net.block_udp = args.block_udp
+  net.block_tcp = args.block_tcp
       
   limit_task = asyncio.create_task(ratelimit.reset_limits_timer())
   ws_logger = logging.getLogger("websockets")

wisp/server/net.py

@@ -10,6 +10,8 @@ from python_socks.async_.asyncio import Proxy
 tcp_size = 64*1024
 block_loopback = False
 block_private = False
+block_udp = False
+block_tcp = False
 
 proxy_url = None
 proxy_dns = False
@@ -45,7 +47,8 @@ def validate_ip(addr_str):
 
 async def validate_hostname(host, port, stream_type):
   if is_ip(host):
-    return validate_ip(host)
+    validate_ip(host)
+    return host
   #don't do a dns lookup when we're on a proxy and using remote dns
   elif proxy_url and proxy_dns:
     return None
@@ -62,6 +65,9 @@ class TCPConnection:
     self.tcp_reader = None
   
   async def connect(self):
+    if block_tcp:
+      raise TypeError("TCP connection blocked.")
+
     addr_str = await validate_hostname(self.hostname, self.port, 0x01)
     if proxy_url:
       proxy = Proxy.from_url(proxy_url, rdns=proxy_dns)
@@ -99,8 +105,11 @@ class UDPConnection:
     self.socket = None
   
   async def connect(self):
+    if block_udp:
+      raise TypeError("UDP connection blocked.")
     if proxy_url:
       raise NotImplementedError("SOCKS/HTTP proxy is not supported for UDP.")
+
     addr_str = await validate_hostname(self.hostname, self.port, 0x02)
     self.socket = await asyncudp.create_socket(remote_addr=(addr_str, self.port))
   

{wisp_python-0.8.0.dist-info → wisp_python-0.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wisp-python
-Version: 0.8.0
+Version: 0.8.2
 Summary: An implementation of a Wisp proxy server in Python
 Author: ading2210
 Project-URL: Homepage, https://github.com/MercuryWorkshop/wisp-server-python
@@ -42,10 +42,10 @@ For the best performance use [CPython](https://github.com/python/cpython) 3.11 o
 
 To start the server, run `python3 -m wisp.server`. The program accepts the following arguments:
 ```
-usage: wisp-server-python [-h] [--host HOST] [--port PORT] [--static STATIC] [--limits] [--bandwidth BANDWIDTH] [--connections CONNECTIONS] [--window WINDOW] [--allow-loopback] [--allow-private]
-                          [--log-level LOG_LEVEL] [--threads THREADS] [--proxy PROXY]
+usage: wisp-server-python [-h] [--host HOST] [--port PORT] [--static STATIC] [--limits] [--bandwidth BANDWIDTH] [--connections CONNECTIONS] [--window WINDOW] [--allow-loopback] [--allow-private] [--log-level LOG_LEVEL]
+                          [--threads THREADS] [--proxy PROXY] [--block-udp] [--block-tcp]
 
-A Wisp server implementation, written in Python (v0.8.0)
+A Wisp server implementation, written in Python (v0.8.1)
 
 options:
   -h, --help            show this help message and exit
@@ -64,6 +64,8 @@ options:
                         The log level (either debug, info, warning, error, or critical).
   --threads THREADS     The number of threads to run the server on. By default it uses all CPU cores. (Linux only)
   --proxy PROXY         The url of the socks5h, socks5, sock4a, socks4 or http proxy to use.
+  --block-udp           Block UDP streams.
+  --block-tcp           Block TCP streams.
 ```
 
 ## Roadmap:
@@ -76,7 +78,7 @@ options:
 ## Copyright:
 This repository is licensed under the GNU AGPL v3.
 
-A few third party libraries are used. See [`LICENSE_third_party.md`](https://github.com/MercuryWorkshop/wisp-server-python/blob/main/LICENSE).
+A few third party libraries are used. See [`LICENSE_third_party.md`](https://github.com/MercuryWorkshop/wisp-server-python/blob/main/LICENSE_third_party.md).
 
 ### Copyright Notice:
 ```

wisp_python-0.8.2.dist-info/RECORD

@@ -0,0 +1,15 @@
+wisp/__init__.py,sha256=02Fv0s_jJG8U4y5B6AzKPIOzxAuqJyY_So8Guz5bdTk,75
+wisp/util.py,sha256=AU7si8VwJqS8Dwc1PT2pu_f_9Y32GQxivRYwJ3-U0YQ,144
+wisp/server/__init__.py,sha256=LmgQ1nTlnqcTPqRJVc1NGapV9qVR-BK8iPVUMSJ74Qs,102
+wisp/server/__main__.py,sha256=zhDqmhOY9HgHx-BOq-kU5IoxZCMJwt_PEEEISaZr9Mk,68
+wisp/server/cli.py,sha256=4cCcs9rDkELPcufVMbdJ3DATJ7z7ThnEAX9sJ8IEWFo,3526
+wisp/server/connection.py,sha256=V_Skmmsvn30lQKY5w9x2rJQFR_FsA3lngNDpaYOfX6U,7669
+wisp/server/http.py,sha256=wEEpxhiodf6E4cacuRYm-WAzp7wZDqDloeESfjSSPu4,3460
+wisp/server/net.py,sha256=_Uxv9w1DCCcJO7VaSOfxQhM5PYpwrYm3Hd1XDQ5F_n8,3362
+wisp/server/ratelimit.py,sha256=cic_rlBaM-tp6kJaSz4ITGvUbsX4JLSGSUgF5cPO0FY,1926
+wisp_python-0.8.2.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+wisp_python-0.8.2.dist-info/licenses/LICENSE_third_party.md,sha256=_YgCpygAXxOtr7gpjRTv7W1DTqZU_f7IMwjdPvw4VxY,15360
+wisp_python-0.8.2.dist-info/METADATA,sha256=OHzsbU4-wtxxlhfdc0FTsOFQg2pMp45DSs4TOAZlYRE,4184
+wisp_python-0.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wisp_python-0.8.2.dist-info/top_level.txt,sha256=sv0LDAu8cHUc3_VTsCKfXU-6B9HdV4dW22ubeW8KPVs,5
+wisp_python-0.8.2.dist-info/RECORD,,

wisp_python-0.8.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-wisp/__init__.py,sha256=02Fv0s_jJG8U4y5B6AzKPIOzxAuqJyY_So8Guz5bdTk,75
-wisp/util.py,sha256=AU7si8VwJqS8Dwc1PT2pu_f_9Y32GQxivRYwJ3-U0YQ,144
-wisp/server/__init__.py,sha256=LmgQ1nTlnqcTPqRJVc1NGapV9qVR-BK8iPVUMSJ74Qs,102
-wisp/server/__main__.py,sha256=zhDqmhOY9HgHx-BOq-kU5IoxZCMJwt_PEEEISaZr9Mk,68
-wisp/server/cli.py,sha256=HU7ujypsFoP7JnZyy_56ZLlPvYNSxPPMyCVzmYDxabk,3356
-wisp/server/connection.py,sha256=V_Skmmsvn30lQKY5w9x2rJQFR_FsA3lngNDpaYOfX6U,7669
-wisp/server/http.py,sha256=58rMjYygIko364nvGSXMA7v5gmj4sNSecBYFJWTEVVs,3394
-wisp/server/net.py,sha256=yNDjw8FHA-0IgSI4c_6s2td38wd74PtV2W_gOZA3u-g,3181
-wisp/server/ratelimit.py,sha256=cic_rlBaM-tp6kJaSz4ITGvUbsX4JLSGSUgF5cPO0FY,1926
-wisp_python-0.8.0.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-wisp_python-0.8.0.dist-info/licenses/LICENSE_third_party.md,sha256=_YgCpygAXxOtr7gpjRTv7W1DTqZU_f7IMwjdPvw4VxY,15360
-wisp_python-0.8.0.dist-info/METADATA,sha256=GZmYPhNuPJNjouQ1VO5u4x6b3laFfmA0kBI65_oExdc,4055
-wisp_python-0.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wisp_python-0.8.0.dist-info/top_level.txt,sha256=sv0LDAu8cHUc3_VTsCKfXU-6B9HdV4dW22ubeW8KPVs,5
-wisp_python-0.8.0.dist-info/RECORD,,