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

Update server.py

Browse Source
This commit is contained in:
Namhyeon Go 2024-02-28 16:10:16 +09:00 committed by GitHub
parent d7cb835871
commit ecfee14c8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server.py
View File

@ -26,11 +26,21 @@ from datetime import datetime
from platform import python_version from platform import python_version
import requests import requests
from requests.auth import HTTPBasicAuth
from decouple import config from decouple import config
def parse_url_with_credential(s):
username, password, url = (None, None, s)
parts = s.split('://', 1)
if len(parts) > 1:
credentials, rest = parts[1].split('@', 1)
username, password = credentials.split(':', 1)
url = parts[0] + "://" + rest)
return (username, password, url)
try: try:
listening_port = config('PORT', cast=int) listening_port = config('PORT', cast=int)
server_url = config('SERVER_URL') _username, _password, server_url = parse_url_with_credential(config('SERVER_URL'))
server_connection_type = config('SERVER_CONNECTION_TYPE') server_connection_type = config('SERVER_CONNECTION_TYPE')
cakey = config('CA_KEY') cakey = config('CA_KEY')
cacert = config('CA_CERT') cacert = config('CA_CERT')
@ -46,7 +56,6 @@ except KeyboardInterrupt:
sys.exit() sys.exit()
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('--max_conn', help="Maximum allowed connections", default=255, type=int) parser.add_argument('--max_conn', help="Maximum allowed connections", default=255, type=int)
parser.add_argument('--buffer_size', help="Number of samples to be used", default=8192, type=int) parser.add_argument('--buffer_size', help="Number of samples to be used", default=8192, type=int)
@ -56,6 +65,10 @@ buffer_size = args.buffer_size
accepted_relay = {} accepted_relay = {}
resolved_address_list = [] resolved_address_list = []
auth = None
if _username:
auth = HTTPBasicAuth(_username, _password)
def jsonrpc2_create_id(data): def jsonrpc2_create_id(data):
return hashlib.sha1(json.dumps(data).encode(client_encoding)).hexdigest() return hashlib.sha1(json.dumps(data).encode(client_encoding)).hexdigest()
@ -332,7 +345,7 @@ def proxy_server(webserver, port, scheme, method, url, conn, addr, data):
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')
query = requests.post(server_url, headers=proxy_data['headers'], data=query_data, timeout=1) query = requests.post(server_url, headers=proxy_data['headers'], data=query_data, timeout=1, auth=auth)
if query.status_code == 200: if query.status_code == 200:
result = query.json()['result'] result = query.json()['result']
resolved_address_list.append(result['client_address']) resolved_address_list.append(result['client_address'])
@ -345,7 +358,7 @@ def proxy_server(webserver, port, scheme, method, url, conn, addr, data):
def relay_connect(id, raw_data, proxy_data): def relay_connect(id, raw_data, proxy_data):
try: try:
# The tunnel connect forever until the client destroy it # The tunnel connect forever until the client destroy it
relay = requests.post(server_url, headers=proxy_data['headers'], data=raw_data, stream=True, timeout=None) relay = requests.post(server_url, headers=proxy_data['headers'], data=raw_data, stream=True, timeout=None, auth=auth)
for chunk in relay.iter_content(chunk_size=buffer_size): for chunk in relay.iter_content(chunk_size=buffer_size):
print (chunk) print (chunk)
except requests.exceptions.ReadTimeout as e: except requests.exceptions.ReadTimeout as e:
@ -415,7 +428,7 @@ def proxy_server(webserver, port, scheme, method, url, conn, addr, data):
print("[*] Sending %s bytes..." % (str(len(raw_data)))) print("[*] Sending %s bytes..." % (str(len(raw_data))))
i = 0 i = 0
relay = requests.post(server_url, headers=proxy_data['headers'], data=raw_data, stream=True) relay = requests.post(server_url, headers=proxy_data['headers'], data=raw_data, stream=True, auth=auth)
buffered = b'' buffered = b''
for chunk in relay.iter_content(chunk_size=buffer_size): for chunk in relay.iter_content(chunk_size=buffer_size):
buffered += chunk buffered += chunk