gnh1201/caterpillar
1
0
Fork 0
mirror of https://github.com/gnh1201/caterpillar.git synced 2025-05-07 12:16:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update server.py

Browse Source
This commit is contained in:
Namhyeon Go 2025-02-17 10:04:36 +09:00 committed by GitHub
parent 6d368eb9e6
commit 4f46d3e75f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server.py
View File

@ -7,7 +7,7 @@
# Namyheon Go (Catswords Research) <gnh1201@gmail.com> # Namyheon Go (Catswords Research) <gnh1201@gmail.com>
# https://github.com/gnh1201/caterpillar # https://github.com/gnh1201/caterpillar
# Created at: 2022-10-06 # Created at: 2022-10-06
# Updated at: 2024-11-18 # Updated at: 2025-02-17
# #
import argparse import argparse
@ -463,6 +463,8 @@ def proxy_server(
# stateful mode # stateful mode
elif server_connection_type == "stateful": elif server_connection_type == "stateful":
client_address = str(addr[0])
proxy_data = { proxy_data = {
"headers": { "headers": {
"User-Agent": "php-httpproxy/0.1.5 (Client; Python " "User-Agent": "php-httpproxy/0.1.5 (Client; Python "
@ -471,7 +473,7 @@ def proxy_server(
}, },
"data": { "data": {
"buffer_size": str(buffer_size), "buffer_size": str(buffer_size),
"client_address": str(addr[0]), "client_address": client_address,
"client_port": str(listening_port), "client_port": str(listening_port),
"client_encoding": client_encoding, "client_encoding": client_encoding,
"remote_address": webserver.decode(client_encoding), "remote_address": webserver.decode(client_encoding),
@ -482,7 +484,7 @@ def proxy_server(
} }
# get client address # get client address
logger.info("[*] resolving the client address...") logger.info("[*] Resolving the client address...")
while len(resolved_address_list) == 0: while len(resolved_address_list) == 0:
try: try:
_, query_data = jsonrpc2_encode("get_client_address") _, query_data = jsonrpc2_encode("get_client_address")
@ -495,11 +497,23 @@ def proxy_server(
) )
if query.status_code == 200: if query.status_code == 200:
result = query.json()["result"] result = query.json()["result"]
resolved_address_list.append(result["data"])
logger.info("[*] resolved IP: %s" % (result["data"])) if isinstance(result["data"], str):
client_address = result["data"]
resolved_address_list.append(client_address)
elif isinstance(result["data"], list):
client_address = result["data"][0]
resolved_address_list.append(client_address)
else:
logger.warn("[*] Failed to resolve a client address. Retrying...")
else:
logger.warn("[*] Failed to resolve a client address. Retrying...")
except requests.exceptions.ReadTimeout: except requests.exceptions.ReadTimeout:
pass logger.warn("[*] Failed to resolve a client address. Retrying...")
proxy_data["data"]["client_address"] = resolved_address_list[0]
# update the client address
logger.info("[*] Use the client address: %s" % (client_address))
proxy_data["data"]["client_address"] = client_address
# build a tunnel # build a tunnel
def relay_connect(id, raw_data, proxy_data): def relay_connect(id, raw_data, proxy_data):